Misses this file to merge. I like the comments.

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

diff --git a/lib/theme.php b/lib/theme.php
index 1239e317f4e9cab68440a00fae206a4ccbb76838..ef7290de2398ea2cdb973f3dea636f3831424a34 100644 (file)
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -106,9 +106,9 @@ class Theme
 
         // Ruh roh. Fall back to default, then.
 
-        common_log(LOG_WARN, sprintf("Unable to find theme '%s', falling back to default theme '%s'",
-                                     $name,
-                                     Theme::FALLBACK));
+        common_log(LOG_WARNING, sprintf("Unable to find theme '%s', falling back to default theme '%s'",
+                                        $name,
+                                        Theme::FALLBACK));
 
         $this->name = Theme::FALLBACK;
         $this->dir  = $instroot.'/'.Theme::FALLBACK;
@@ -130,7 +130,7 @@ class Theme
      */
     protected function relativeThemePath($group, $fallbackSubdir, $name)
     {
-        if (StatusNet::isHTTPS()) {
+        if (GNUsocial::isHTTPS()) {
             $sslserver = common_config($group, 'sslserver');
 
             if (empty($sslserver)) {