Merge pull request #5980 from marcov4lente/CRM-15829+CRM15881-for-4.6

[civicrm-core.git] / CRM / Case / XMLProcessor / Settings.php

diff --git a/CRM/Case/XMLProcessor/Settings.php b/CRM/Case/XMLProcessor/Settings.php
index ebf77564487c4797bead85f4e2c899a9dc2aaa2d..42ec6296ec83afc0a485ef37ae55305db4a6d4e4 100644 (file)
--- a/CRM/Case/XMLProcessor/Settings.php
+++ b/CRM/Case/XMLProcessor/Settings.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$
  *
  */
@@ -36,14 +36,14 @@ class CRM_Case_XMLProcessor_Settings extends CRM_Case_XMLProcessor {
 
   private $_settings = array();
 
-  // Input: The base filename without the .xml extension
-  // Output: An array of settings.
   /**
+   * Input: The base filename without the .xml extension
+   * Output: An array of settings.
    * @param string $filename
    *
    * @return array
    */
-  function run($filename = 'settings') {
+  public function run($filename = 'settings') {
     $xml = $this->retrieve($filename);
 
     // For now it's not an error. In the future it might be a required file.
@@ -60,5 +60,5 @@ class CRM_Case_XMLProcessor_Settings extends CRM_Case_XMLProcessor {
     }
     return $this->_settings;
   }
-}
 
+}