The overloaded DB_DataObject function staticGet is now called getKV

[quix0rs-gnu-social.git] / classes / File_redirection.php

diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index 321a0b751f64e41c557ca6537116af3985f38836..00a5216505a8171df20642e0c3c6b0b86fcb956f 100644 (file)
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -165,16 +165,16 @@ class File_redirection extends Managed_DataObject
      */
     public function where($in_url, $discover=true) {
         // let's see if we know this...
-        $a = File::staticGet('url', $in_url);
+        $a = File::getKV('url', $in_url);
 
         if (!empty($a)) {
             // this is a direct link to $a->url
             return $a->url;
         } else {
-            $b = File_redirection::staticGet('url', $in_url);
+            $b = File_redirection::getKV('url', $in_url);
             if (!empty($b)) {
                 // this is a redirect to $b->file_id
-                $a = File::staticGet('id', $b->file_id);
+                $a = File::getKV('id', $b->file_id);
                 return $a->url;
             }
         }
@@ -250,7 +250,7 @@ class File_redirection extends Managed_DataObject
         if (!empty($short_url) && $short_url != $long_url) {
             $short_url = (string)$short_url;
             // store it
-            $file = File::staticGet('url', $long_url);
+            $file = File::getKV('url', $long_url);
             if (empty($file)) {
                 // Check if the target URL is itself a redirect...
                 $redir_data = File_redirection::where($long_url);
@@ -264,7 +264,7 @@ class File_redirection extends Managed_DataObject
                     }
                 } else if (is_string($redir_data)) {
                     // The file is a known redirect target.
-                    $file = File::staticGet('url', $redir_data);
+                    $file = File::getKV('url', $redir_data);
                     if (empty($file)) {
                         // @fixme should we save a new one?
                         // this case was triggering sometimes for redirects
@@ -278,7 +278,7 @@ class File_redirection extends Managed_DataObject
             } else {
                 $file_id = $file->id;
             }
-            $file_redir = File_redirection::staticGet('url', $short_url);
+            $file_redir = File_redirection::getKV('url', $short_url);
             if (empty($file_redir)) {
                 $file_redir = new File_redirection;
                 $file_redir->url = $short_url;