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 513666a65678afc17072107fc7212eebb57d4df8..bab8a6dbccdb00c9a6c3a3895855c24d59ed8f44 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -394,8 +394,7 @@ class Action extends HTMLOutputter // lawsuit
     {
         $theme = new Theme($mainTheme);
 
-        // Some themes may have external stylesheets, such as using the
-        // Google Font APIs to load webfonts.
+        // Some themes may have external stylesheets
         foreach ($theme->getExternals() as $url) {
             $this->cssLink($url, $mainTheme, $media);
         }
@@ -435,7 +434,6 @@ class Action extends HTMLOutputter // lawsuit
             if (Event::handle('StartShowStatusNetScripts', array($this))) {
                 $this->script('util.js');
                 $this->script('xbImportNode.js');
-                $this->script('geometa.js');
 
                 // This route isn't available in single-user mode.
                 // Not sure why, but it causes errors here.
@@ -663,10 +661,14 @@ class Action extends HTMLOutputter // lawsuit
                     // if logo is an uploaded file, try to fall back to HTTPS file URL
                     $httpUrl = common_config('site', 'logo');
                     if (!empty($httpUrl)) {
-                        $f = File::getKV('url', $httpUrl);
-                        if (!empty($f) && !empty($f->filename)) {
-                            // this will handle the HTTPS case
-                            $logoUrl = File::url($f->filename);
+                        try {
+                            $f = File::getByUrl($httpUrl);
+                            if (!empty($f->filename)) {
+                                // this will handle the HTTPS case
+                                $logoUrl = File::url($f->filename);
+                            }
+                        } catch (NoResultException $e) {
+                            // no match
                         }
                     }
                 }