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/AddUser.php
+++ b/airtime_mvc/application/forms/AddUser.php
@ -21,6 +21,10 @@ class Application_Form_AddUser extends Zend_Form
        $hidden->setDecorators(array('ViewHelper'));
        $this->addElement($hidden);

+        $this->addElement('hash', 'csrf', array(
+           'salt' => 'unique'
+        ));
+
        $login = new Zend_Form_Element_Text('login');
        $login->setLabel(_('Username:'));
        $login->setAttrib('class', 'input_text');