Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.

2014-10-10 19:57:22 +00:00 · 2014-10-10 19:57:22 +00:00 · 9fb35c448e
commit 9fb35c448e
parent 0196aa21f5 081ca0a6a4
24 changed files with 165 additions and 106 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();