Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Robert Elder 2014-10-10 19:57:22 +00:00
commit 9fb35c448e
24 changed files with 165 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/forms/EditUser.php
View file

@ -22,6 +22,10 @@ class Application_Form_EditUser extends Zend_Form
$this->setDecorators(array(
array('ViewScript', array('viewScript' => 'form/edit-user.phtml', "currentUser" => $currentUser->getLogin()))));
$this->setAttrib('id', 'current-user-form');
$this->addElement('hash', 'csrf', array(
'salt' => 'unique'
));
$hidden = new Zend_Form_Element_Hidden('cu_user_id');
$hidden->setDecorators(array('ViewHelper'));