X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FAdmin%2FForm%2FSetting%2FMiscellaneous.php;h=277c278fb90f3f5a451e1eef144fcb7d8133deb4;hb=d5ad8c27aae985b4b0e794a8d5328c83da670f57;hp=4bff04c95fe62f6ea7accfb601ab3253c178a178;hpb=c6e262c51134924a9cc023dcb0613238fd1d0451;p=civicrm-core.git diff --git a/CRM/Admin/Form/Setting/Miscellaneous.php b/CRM/Admin/Form/Setting/Miscellaneous.php index 4bff04c95f..277c278fb9 100644 --- a/CRM/Admin/Form/Setting/Miscellaneous.php +++ b/CRM/Admin/Form/Setting/Miscellaneous.php @@ -3,7 +3,7 @@ +--------------------------------------------------------------------+ | CiviCRM version 4.6 | +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2014 | + | Copyright CiviCRM LLC (c) 2004-2015 | +--------------------------------------------------------------------+ | This file is a part of CiviCRM. | | | @@ -23,12 +23,12 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * * @package CRM - * @copyright CiviCRM LLC (c) 2004-2014 + * @copyright CiviCRM LLC (c) 2004-2015 * $Id$ * */ @@ -56,9 +56,8 @@ class CRM_Admin_Form_Setting_Miscellaneous extends CRM_Admin_Form_Setting { public $_uploadMaxSize; /** - * Basic setup + * Basic setup. */ - public function preProcess() { $config = CRM_Core_Config::singleton(); $this->_uploadMaxSize = (int) ini_get('upload_max_filesize'); @@ -67,7 +66,7 @@ class CRM_Admin_Form_Setting_Miscellaneous extends CRM_Admin_Form_Setting { } /** - * Build the form object + * Build the form object. * * @return void */ @@ -78,7 +77,7 @@ class CRM_Admin_Form_Setting_Miscellaneous extends CRM_Admin_Form_Setting { $validTriggerPermission = CRM_Core_DAO::checkTriggerViewPermission(FALSE); // FIXME: for now, disable logging for multilingual sites OR if triggers are not permittted - $domain = new CRM_Core_DAO_Domain; + $domain = new CRM_Core_DAO_Domain(); $domain->find(TRUE); $attribs = $domain->locales || !$validTriggerPermission ? array('disabled' => 'disabled') : array(); @@ -117,7 +116,7 @@ class CRM_Admin_Form_Setting_Miscellaneous extends CRM_Admin_Form_Setting { } /** - * Global form rule + * Global form rule. * * @param array $fields * The input form values. @@ -128,7 +127,6 @@ class CRM_Admin_Form_Setting_Miscellaneous extends CRM_Admin_Form_Setting { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $options) { $errors = array(); @@ -167,7 +165,7 @@ class CRM_Admin_Form_Setting_Miscellaneous extends CRM_Admin_Form_Setting { parent::postProcess(); if ($config->logging != $values['logging']) { - $logging = new CRM_Logging_Schema; + $logging = new CRM_Logging_Schema(); if ($values['logging']) { $logging->enableLogging(); } @@ -176,4 +174,5 @@ class CRM_Admin_Form_Setting_Miscellaneous extends CRM_Admin_Form_Setting { } } } + }