Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 11:10:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6641 from nupplaphil/config_followup

Browse source 
Config FollowUp
This commit is contained in:
Hypolite Petovan 2019-02-17 17:56:31 -05:00 • committed by GitHub
commit 256e845c5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
75 changed files with 2606 additions and 1368 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Object/Image.php
View file

@ -5,6 +5,7 @@
*/
namespace Friendica\Object;
use Exception;
use Friendica\App;
use Friendica\Core\Cache;
use Friendica\Core\Config;
@ -14,7 +15,6 @@ use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Photo;
use Friendica\Util\Network;
use Exception;
use Imagick;
use ImagickPixel;
@ -656,7 +656,7 @@ class Image
$stamp1 = microtime(true);
file_put_contents($path, $string);
$a->saveTimestamp($stamp1, "file");
$a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
}
/**
@ -802,7 +802,7 @@ class Image
$a = \get_app();
$stamp1 = microtime(true);
file_put_contents($tempfile, $img_str);
$a->saveTimestamp($stamp1, "file");
$a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
$data = getimagesize($tempfile);
unlink($tempfile);
@ -910,7 +910,7 @@ class Image
$stamp1 = microtime(true);
$imagedata = @file_get_contents($url);
$a->saveTimestamp($stamp1, "file");
$a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
}
$maximagesize = Config::get('system', 'maximagesize');
@ -924,7 +924,7 @@ class Image
$stamp1 = microtime(true);
file_put_contents($tempfile, $imagedata);
$a->saveTimestamp($stamp1, "file");
$a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
$data = getimagesize($tempfile);