From 8a002e98bc0145e9ff0f739ac52d3c192c3bfae8 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Sun, 7 Jun 2015 09:52:48 +0200
Subject: [PATCH] File-related functions not declared static

---
 classes/File_redirection.php           | 8 ++++----
 classes/File_to_post.php               | 2 +-
 plugins/Oembed/classes/File_oembed.php | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index ea9db8e891..ba516e4623 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -94,7 +94,7 @@ class File_redirection extends Managed_DataObject
      *                size (optional): byte size from Content-Length header
      *                time (optional): timestamp from Last-Modified header
      */
-    public function lookupWhere($short_url, $redirs = 10, $protected = false) {
+    static function lookupWhere($short_url, $redirs = 10, $protected = false) {
         if ($redirs < 0) return false;
 
         if(strpos($short_url,'://') === false){
@@ -249,7 +249,7 @@ class File_redirection extends Managed_DataObject
         }
     }
 
-    function _userMakeShort($long_url, User $user=null, $force = false) {
+    static function _userMakeShort($long_url, User $user=null, $force = false) {
         $short_url = common_shorten_url($long_url, $user, $force);
         if (!empty($short_url) && $short_url != $long_url) {
             $short_url = (string)$short_url;
@@ -304,7 +304,7 @@ class File_redirection extends Managed_DataObject
      * @param string $default_scheme if given a bare link; defaults to 'http://'
      * @return string
      */
-    function _canonUrl($in_url, $default_scheme = 'http://') {
+    static function _canonUrl($in_url, $default_scheme = 'http://') {
         if (empty($in_url)) return false;
         $out_url = $in_url;
         $p = parse_url($out_url);
@@ -342,7 +342,7 @@ class File_redirection extends Managed_DataObject
         return $out_url;
     }
 
-    function saveNew($data, $file_id, $url) {
+    static function saveNew($data, $file_id, $url) {
         $file_redir = new File_redirection;
         $file_redir->urlhash = File::hashurl($short_url);
         $file_redir->url = $url;
diff --git a/classes/File_to_post.php b/classes/File_to_post.php
index e06e34aa46..bf201756f4 100644
--- a/classes/File_to_post.php
+++ b/classes/File_to_post.php
@@ -56,7 +56,7 @@ class File_to_post extends Managed_DataObject
         );
     }
 
-    function processNew(File $file, Notice $notice) {
+    static function processNew(File $file, Notice $notice) {
         static $seen = array();
 
         $file_id = $file->getID();
diff --git a/plugins/Oembed/classes/File_oembed.php b/plugins/Oembed/classes/File_oembed.php
index 3fc655e170..0e84c6dca8 100644
--- a/plugins/Oembed/classes/File_oembed.php
+++ b/plugins/Oembed/classes/File_oembed.php
@@ -67,7 +67,7 @@ class File_oembed extends Managed_DataObject
         );
     }
 
-    function _getOembed($url) {
+    static function _getOembed($url) {
         $parameters = array(
             'maxwidth' => common_config('thumbnail', 'width'),
             'maxheight' => common_config('thumbnail', 'height'),
-- 
2.39.5