Merge branch '2.5.x' into saas

This commit is contained in:
drigato 2014-09-19 15:00:58 -04:00
commit a0b40e1f7d

View file

@ -90,6 +90,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
_("Enabled")));
$third_party_api->setValue(Application_Model_Preference::GetAllow3rdPartyApi());
$third_party_api->setDecorators(array('ViewHelper'));
$third_party_api->setValue(true);
$this->addElement($third_party_api);
//
// Add the description element