Merge branch 'saas' into saas-store-file-size-and-hash-in-db

2015-02-24 16:44:17 -05:00 · 2015-02-24 16:44:17 -05:00 · 38aa1d1cd9
commit 38aa1d1cd9
parent d843de80cc 31ea92d983
18 changed files with 8709 additions and 11 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();