Merge remote-tracking branch 'upstream/nightly' into nightly

[quix0rs-gnu-social.git] / lib / action.php

diff --git a/lib/action.php b/lib/action.php
index 86b4908b3d2be0cf3cf3dd8fc6840b1bae3f5cb5..bab8a6dbccdb00c9a6c3a3895855c24d59ed8f44 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -662,7 +662,7 @@ class Action extends HTMLOutputter // lawsuit
                     $httpUrl = common_config('site', 'logo');
                     if (!empty($httpUrl)) {
                         try {
-                            $f = File::getByUrl('url', $httpUrl);
+                            $f = File::getByUrl($httpUrl);
                             if (!empty($f->filename)) {
                                 // this will handle the HTTPS case
                                 $logoUrl = File::url($f->filename);