We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 8a002e98 authored by mattl's avatar mattl

File-related functions not declared static

parent 4fc62a8b
...@@ -94,7 +94,7 @@ class File_redirection extends Managed_DataObject ...@@ -94,7 +94,7 @@ class File_redirection extends Managed_DataObject
* size (optional): byte size from Content-Length header * size (optional): byte size from Content-Length header
* time (optional): timestamp from Last-Modified 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 ($redirs < 0) return false;
if(strpos($short_url,'://') === false){ if(strpos($short_url,'://') === false){
...@@ -249,7 +249,7 @@ class File_redirection extends Managed_DataObject ...@@ -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); $short_url = common_shorten_url($long_url, $user, $force);
if (!empty($short_url) && $short_url != $long_url) { if (!empty($short_url) && $short_url != $long_url) {
$short_url = (string)$short_url; $short_url = (string)$short_url;
...@@ -304,7 +304,7 @@ class File_redirection extends Managed_DataObject ...@@ -304,7 +304,7 @@ class File_redirection extends Managed_DataObject
* @param string $default_scheme if given a bare link; defaults to 'http://' * @param string $default_scheme if given a bare link; defaults to 'http://'
* @return string * @return string
*/ */
function _canonUrl($in_url, $default_scheme = 'http://') { static function _canonUrl($in_url, $default_scheme = 'http://') {
if (empty($in_url)) return false; if (empty($in_url)) return false;
$out_url = $in_url; $out_url = $in_url;
$p = parse_url($out_url); $p = parse_url($out_url);
...@@ -342,7 +342,7 @@ class File_redirection extends Managed_DataObject ...@@ -342,7 +342,7 @@ class File_redirection extends Managed_DataObject
return $out_url; return $out_url;
} }
function saveNew($data, $file_id, $url) { static function saveNew($data, $file_id, $url) {
$file_redir = new File_redirection; $file_redir = new File_redirection;
$file_redir->urlhash = File::hashurl($short_url); $file_redir->urlhash = File::hashurl($short_url);
$file_redir->url = $url; $file_redir->url = $url;
......
...@@ -56,7 +56,7 @@ class File_to_post extends Managed_DataObject ...@@ -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(); static $seen = array();
$file_id = $file->getID(); $file_id = $file->getID();
......
...@@ -67,7 +67,7 @@ class File_oembed extends Managed_DataObject ...@@ -67,7 +67,7 @@ class File_oembed extends Managed_DataObject
); );
} }
function _getOembed($url) { static function _getOembed($url) {
$parameters = array( $parameters = array(
'maxwidth' => common_config('thumbnail', 'width'), 'maxwidth' => common_config('thumbnail', 'width'),
'maxheight' => common_config('thumbnail', 'height'), 'maxheight' => common_config('thumbnail', 'height'),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment