Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas

2015-02-24 15:03:06 -05:00 · 2015-02-24 15:03:06 -05:00 · e13e4413ea
commit e13e4413ea
parent a6579e4d09 5e256df061
5 changed files with 31 additions and 7 deletions
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@ -116,6 +116,15 @@ class PreferenceController extends Zend_Controller_Action
    {
    }

+    public function removeLogoAction()
+    {
+        $this->view->layout()->disableLayout();
+        // Remove reliance on .phtml files to render requests
+        $this->_helper->viewRenderer->setNoRender(true);
+
+        Application_Model_Preference::SetStationLogo("");
+    }
+
    public function streamSettingAction()
    {
        $CC_CONFIG = Config::getConfig();