X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FAdmin%2FForm%2FSetting%2FUpdateConfigBackend.php;h=ad18055e9ee5000850e6a3dda87270fb0d08ead0;hb=02fc859b3146244f5f4f3c2c4d9ffce229e06d40;hp=7ea6bde55fe357f84efacf9c986ca096ad2e8684;hpb=0e5a856011834bdf5616a1b9d340ebbc59185bbd;p=civicrm-core.git diff --git a/CRM/Admin/Form/Setting/UpdateConfigBackend.php b/CRM/Admin/Form/Setting/UpdateConfigBackend.php index 7ea6bde55f..ad18055e9e 100644 --- a/CRM/Admin/Form/Setting/UpdateConfigBackend.php +++ b/CRM/Admin/Form/Setting/UpdateConfigBackend.php @@ -1,7 +1,7 @@ _defaults) { parent::setDefaultValues(); @@ -96,7 +95,7 @@ class CRM_Admin_Form_Setting_UpdateConfigBackend extends CRM_Admin_Form_Setting * * @return array */ - static function formRule($fields) { + public static function formRule($fields) { $tmpDir = trim($fields['newBaseDir']); $errors = array(); @@ -108,7 +107,7 @@ class CRM_Admin_Form_Setting_UpdateConfigBackend extends CRM_Admin_Form_Setting return $errors; } - function postProcess() { + public function postProcess() { if (!empty($_POST['_qf_UpdateConfigBackend_next_cleanup'])) { $config = CRM_Core_Config::singleton(); @@ -138,11 +137,11 @@ class CRM_Admin_Form_Setting_UpdateConfigBackend extends CRM_Admin_Form_Setting $val = CRM_Utils_File::addTrailingSlash($val); } } - - //CRM-15365 - Fix BaseURL to avoid wrong trailing slash on Windows installs + + //CRM-15365 - Fix BaseURL to avoid wrong trailing slash on Windows installs foreach ($params as $name => & $val) { if ($val && in_array($name, array('newBaseURL'))) { - $val = CRM_Utils_File::addTrailingSlash($val,"/"); + $val = CRM_Utils_File::addTrailingSlash($val, "/"); } } @@ -167,4 +166,3 @@ class CRM_Admin_Form_Setting_UpdateConfigBackend extends CRM_Admin_Form_Setting parent::rebuildMenu(); } } -