Site-wide design configuration

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

diff --git a/lib/ownerdesignaction.php b/lib/ownerdesignaction.php
index 785b8a93d3aad2a0a3962e324516d9d7ef726d1e..b42df926d096b7de1891ad909138abccfb061e34 100644 (file)
--- a/lib/ownerdesignaction.php
+++ b/lib/ownerdesignaction.php
@@ -52,26 +52,6 @@ class OwnerDesignAction extends Action {
 
     var $user = null;
 
-    /**
-      * Show the owner's design stylesheet
-      *
-      * @return nothing
-      */
-     function showStylesheets()
-     {
-         parent::showStylesheets();
-
-         $user = common_current_user();
-
-         if (empty($user) || $user->viewdesigns) {
-             $design = $this->getDesign();
-
-             if (!empty($design)) {
-                 $design->showCSS($this);
-             }
-         }
-     }
-
     /**
      * A design for this action
      *
@@ -83,10 +63,15 @@ class OwnerDesignAction extends Action {
 
     function getDesign()
     {
-        if (empty($this->user)) {
-            return null;
+        if (!empty($this->user)) {
+
+            $design = $this->user->getDesign();
+
+            if (!empty($design)) {
+                return $design;
+            }
         }
 
-        return $this->user->getDesign();
+        return parent::getDesign();
     }
 }