Merge pull request #5862 from nupplaphil/rename_App_Methods

[friendica.git] / src / Object / Image.php

diff --git a/src/Object/Image.php b/src/Object/Image.php
index 9506aedc2239b738b96d8136d8bd4eb60f9a5356..166e150bf56366a44696d20b86e024596f77d17e 100644 (file)
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -655,7 +655,7 @@ class Image
 
                $stamp1 = microtime(true);
                file_put_contents($path, $string);
-               $a->save_timestamp($stamp1, "file");
+               $a->saveTimestamp($stamp1, "file");
        }
 
        /**
@@ -730,7 +730,7 @@ class Image
                if ($fromcurl) {
                        $a = get_app();
                        $headers=[];
-                       $h = explode("\n", $a->get_curl_headers());
+                       $h = explode("\n", Network::getCurl()->getHeaders());
                        foreach ($h as $l) {
                                $data = array_map("trim", explode(":", trim($l), 2));
                                if (count($data) > 1) {
@@ -792,14 +792,14 @@ class Image
 
                        try {
                                if (function_exists("getimagesizefromstring")) {
-                                       $data = getimagesizefromstring($img_str);
+                                       $data = @getimagesizefromstring($img_str);
                                } else {
                                        $tempfile = tempnam(get_temppath(), "cache");
 
                                        $a = get_app();
                                        $stamp1 = microtime(true);
                                        file_put_contents($tempfile, $img_str);
-                                       $a->save_timestamp($stamp1, "file");
+                                       $a->saveTimestamp($stamp1, "file");
 
                                        $data = getimagesize($tempfile);
                                        unlink($tempfile);
@@ -907,7 +907,7 @@ class Image
 
                        $stamp1 = microtime(true);
                        $imagedata = @file_get_contents($url);
-                       $a->save_timestamp($stamp1, "file");
+                       $a->saveTimestamp($stamp1, "file");
                }
 
                $maximagesize = Config::get('system', 'maximagesize');
@@ -921,7 +921,7 @@ class Image
 
                $stamp1 = microtime(true);
                file_put_contents($tempfile, $imagedata);
-               $a->save_timestamp($stamp1, "file");
+               $a->saveTimestamp($stamp1, "file");
 
                $data = getimagesize($tempfile);