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

Merge branch '2.5.x' into saas

This commit is contained in:
drigato 2014-09-19 15:30:16 -04:00
parent a0b40e1f7d 66b97158b7
commit 36b908b4d1
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/forms/GeneralPreferences.php
View File

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

2
airtime_mvc/application/models/Preference.php
View File

@ -443,7 +443,7 @@ class Application_Model_Preference
public static function GetAllow3rdPartyApi() public static function GetAllow3rdPartyApi()
{ {
$val = self::getValue("third_party_api"); $val = self::getValue("third_party_api");
return (strlen($val) == 0 ) ? "0" : $val; return (strlen($val) == 0 ) ? "1" : $val;
} }
public static function SetPhone($phone) public static function SetPhone($phone)