Frio Bugfix: clear float at the end of comment-edit

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index ddf4e1c3b73e85c817651f49d51eac0868c1d03e..123a4b9cfe8b425e5e450b746684e4364f10df8a 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -281,16 +281,15 @@
                                        logger("API call duration: ".round($duration, 2)."\t".$a->query_string, LOGGER_DEBUG);
 
                                        if (get_config("system", "profiler")) {
-                                               logger(sprintf("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s",
+                                               $duration = microtime(true)-$a->performance["start"];
+
+                                               logger(parse_url($a->query_string, PHP_URL_PATH).": ".sprintf("Database: %s/%s, Network: %s, I/O: %s, Other: %s, Total: %s",
                                                        round($a->performance["database"] - $a->performance["database_write"], 3),
                                                        round($a->performance["database_write"], 3),
                                                        round($a->performance["network"], 2),
-                                                       round($a->performance["rendering"], 2),
-                                                       round($a->performance["parser"], 2),
                                                        round($a->performance["file"], 2),
-                                                       round($duration - $a->performance["database"]
-                                                                - $a->performance["network"] - $a->performance["rendering"]
-                                                                - $a->performance["parser"] - $a->performance["file"], 2),
+                                                       round($duration - ($a->performance["database"] + $a->performance["network"]
+                                                               + $a->performance["file"]), 2),
                                                        round($duration, 2)),
                                                        LOGGER_DEBUG);
 
@@ -556,8 +555,8 @@
                                        'screen_name' => (($r[0]['nick']) ? $r[0]['nick'] : $r[0]['name']),
                                        'location' => ($r[0]["location"] != "") ? $r[0]["location"] : $network_name,
                                        'description' => $r[0]["about"],
-                                       'profile_image_url' => $r[0]["photo"],
-                                       'profile_image_url_https' => $r[0]["photo"],
+                                       'profile_image_url' => $r[0]["micro"],
+                                       'profile_image_url_https' => $r[0]["micro"],
                                        'url' => $r[0]["url"],
                                        'protected' => false,
                                        'followers_count' => 0,