Resolved differences merging 2.5.x into saas

2014-10-27 16:25:42 -04:00 · 2014-10-27 16:25:42 -04:00 · 275ca5eed6
commit 275ca5eed6
parent 0196aa21f5 d4e8eed51d
31 changed files with 832 additions and 326 deletions
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@ -171,6 +171,10 @@ class PreferenceController extends Zend_Controller_Action
        $num_of_stream = intval(Application_Model_Preference::GetNumOfStreams());
        $form = new Application_Form_StreamSetting();

+        $form->addElement('hash', 'csrf', array(
+           'salt' => 'unique'
+        ));
+
        $form->setSetting($setting);
        $form->startFrom();