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/forms/Preferences.php
+++ b/airtime_mvc/application/forms/Preferences.php
@ -13,6 +13,14 @@ class Application_Form_Preferences extends Zend_Form
        ));

        $general_pref = new Application_Form_GeneralPreferences();
+
+        $this->addElement('hash', 'csrf', array(
+           'salt' => 'unique',
+           'decorators' => array(
+                'ViewHelper'
+            )
+        ));
+
        $this->addSubForm($general_pref, 'preferences_general');

        $soundcloud_pref = new Application_Form_SoundcloudPreferences();