Merge branch 'devel' into 2.3.x-saas

This commit is contained in:
Martin Konecny 2013-01-17 10:56:18 -05:00
commit 784cb390d3
11 changed files with 79 additions and 13 deletions

View file

@ -203,7 +203,7 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm
$adminUser->setAttrib('alt', 'regular_text');
$this->addElement($adminUser);
$adminPass = new Zend_Form_Element_Text('admin_pass');
$adminPass = new Zend_Form_Element_Password('admin_pass');
$adminPass->setLabel(_("Admin Password"))
->setValue(Application_Model_StreamSetting::getAdminPass($prefix))
->setValidators(array(