Site-wide design configuration

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

diff --git a/lib/groupdesignaction.php b/lib/groupdesignaction.php
index 58777c283a06859a5b635baf08b397ac8b713a5a..c7cdff1fe9c0f2ac26a68d359c8d2d42167e0218 100644 (file)
--- a/lib/groupdesignaction.php
+++ b/lib/groupdesignaction.php
@@ -49,26 +49,6 @@ class GroupDesignAction extends Action {
     /** The group in question */
     var $group = null;
 
-    /**
-      * Show the groups'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
      *
@@ -80,10 +60,12 @@ class GroupDesignAction extends Action {
 
     function getDesign()
     {
-        if (empty($this->group)) {
-            return null;
+        if (!empty($this->group)) {
+            $design = $this->group->getDesign();
+            if (!empty($design)) {
+                return $design;
+            }
         }
-
-        return $this->group->getDesign();
+        return parent::getDesign();
     }
 }