X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FBAO%2FPreferences.php;h=a7020ea7ce6bdd35ee411a2fc2f9c784cda96cd7;hb=553ffa22464ff37a28a070458bcd52097b54235f;hp=7b404bccd28d87526c006af09530f14c56199a12;hpb=1024e1784fb68b8529a77143f5191a60d70837cf;p=civicrm-core.git diff --git a/CRM/Core/BAO/Preferences.php b/CRM/Core/BAO/Preferences.php index 7b404bccd2..a7020ea7ce 100644 --- a/CRM/Core/BAO/Preferences.php +++ b/CRM/Core/BAO/Preferences.php @@ -23,7 +23,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * @@ -54,7 +54,7 @@ AND v.is_active = 1 $dirParams = array(); $urlParams = array(); - $dao = CRM_Core_DAO::executeQuery($sql); + $dao = CRM_Core_DAO::executeQuery($sql); while ($dao->fetch()) { if (!isset($params[$dao->valueName])) { continue; @@ -102,7 +102,8 @@ AND v.name = %3 else { $value = CRM_Utils_System::relativeURL($value); } - $sqlParams = array(1 => array($value, 'String'), + $sqlParams = array( + 1 => array($value, 'String'), 2 => array($optionName, 'String'), 3 => array($name, 'String'), ); @@ -129,7 +130,6 @@ AND v.option_group_id = g.id AND v.is_active = 1 "; - $dao = CRM_Core_DAO::executeQuery($sql); while ($dao->fetch()) { if (!$dao->value) { @@ -148,4 +148,5 @@ AND v.is_active = 1 } } } + }