GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly

This commit is contained in:
abjectio 2015-06-10 22:09:30 +02:00
parent 3bdcdfd114 8a002e98bc
commit 965cd92a72
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
actions/apiaccountratelimitstatus.php
View File

@ -31,9 +31,7 @@
* @link http://status.net/
*/
if (!defined('STATUSNET')) {
exit(1);
}
if (!defined('GNUSOCIAL')) { exit(1); }
/**
* We don't have a rate limit, but some clients check this method.
@ -58,9 +56,9 @@ class ApiAccountRateLimitStatusAction extends ApiBareAuthAction
*
* @return void
*/
function handle($args)
protected function handle()
{
parent::handle($args);
parent::handle();
if (!in_array($this->format, array('xml', 'json'))) {
$this->clientError(
@ -69,7 +67,6 @@ class ApiAccountRateLimitStatusAction extends ApiBareAuthAction
404,
$this->format
);
return;
}
$reset = new DateTime();

8
classes/File_redirection.php
View File

@ -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;

2
classes/File_to_post.php
View File

@ -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();

2
plugins/Oembed/classes/File_oembed.php
View File

@ -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'),