Merge pull request #6044 from monishdeb/CRM-16575

[civicrm-core.git] / CRM / Admin / Form / Setting / Url.php

diff --git a/CRM/Admin/Form/Setting/Url.php b/CRM/Admin/Form/Setting/Url.php
index 1d531c9724aa4d6102275fcbcbbde16507e583cd..28e1f108cacb9e708bcf8d0c0720aeb2ca388e8e 100644 (file)
--- a/CRM/Admin/Form/Setting/Url.php
+++ b/CRM/Admin/Form/Setting/Url.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | 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$
  *
  */
@@ -39,19 +39,18 @@
  */
 class CRM_Admin_Form_Setting_Url extends CRM_Admin_Form_Setting {
   protected $_settings = array(
-    'cvv_backoffice_required' => CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME,
     'disable_core_css' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
   );
+
   /**
-   * Build the form object
+   * Build the form object.
    *
    * @return void
-   * @access public
    */
   public function buildQuickForm() {
     CRM_Utils_System::setTitle(ts('Settings - Resource URLs'));
     $settingFields = civicrm_api('setting', 'getfields', array(
-      'version' => 3
+      'version' => 3,
     ));
 
     $this->addElement('text', 'userFrameworkResourceURL', ts('CiviCRM Resource URL'));
@@ -73,7 +72,7 @@ class CRM_Admin_Form_Setting_Url extends CRM_Admin_Form_Setting {
    *
    * @return array|bool
    */
-  static function formRule($fields) {
+  public static function formRule($fields) {
     if (isset($fields['enableSSL']) &&
       $fields['enableSSL']
     ) {
@@ -98,12 +97,12 @@ class CRM_Admin_Form_Setting_Url extends CRM_Admin_Form_Setting {
     // a potentially spurious message which might already have been set. This
     // is a bit hackish
     // CRM-10629
-    $session = CRM_Core_Session::singleton( );
+    $session = CRM_Core_Session::singleton();
     $session->getStatus(TRUE);
 
     parent::postProcess();
 
     parent::rebuildMenu();
   }
-}
 
+}