Merge pull request #4928 from totten/master-batch0

[civicrm-core.git] / CRM / Core / Config.php

diff --git a/CRM/Core/Config.php b/CRM/Core/Config.php
index 404bd0f4ce7ea5162e4d46339bf538545721b54d..984d4dbd3f2acb05bacdaf94ce15a6fa5fd7713e 100644 (file)
--- a/CRM/Core/Config.php
+++ b/CRM/Core/Config.php
@@ -193,7 +193,6 @@ class CRM_Core_Config extends CRM_Core_Config_Variables {
    *   whether to force a reconstruction.
    *
    * @return CRM_Core_Config
-   * @static
    */
   public static function &singleton($loadFromDB = TRUE, $force = FALSE) {
     if (self::$_singleton === NULL || $force) {
@@ -618,7 +617,8 @@ class CRM_Core_Config extends CRM_Core_Config_Variables {
    * @param string $driver
    *   'CRM_Mailing_BAO_Spool' or a name suitable for Mail::factory().
    * @param array $params
-   * @return Mail (More specifically, a class which implements the "send()" function)
+   * @return object
+   *   More specifically, a class which implements the "send()" function
    */
   public static function _createMailer($driver, $params) {
     if ($driver == 'CRM_Mailing_BAO_Spool') {
@@ -654,7 +654,12 @@ class CRM_Core_Config extends CRM_Core_Config_Variables {
 
     // Whether we delete/create or simply preserve directories, we should
     // certainly make sure the restrictions are enforced.
-    foreach (array($this->templateCompileDir, $this->uploadDir, $this->configAndLogDir, $this->customFileUploadDir) as $dir) {
+    foreach (array(
+               $this->templateCompileDir,
+               $this->uploadDir,
+               $this->configAndLogDir,
+               $this->customFileUploadDir
+             ) as $dir) {
       if ($dir && is_dir($dir)) {
         CRM_Utils_File::restrictAccess($dir);
       }
@@ -668,7 +673,6 @@ class CRM_Core_Config extends CRM_Core_Config_Variables {
    * @param array (reference ) the parameters that need a value
    *
    * @return boolean
-   * @static
    */
   public static function check(&$config, &$required) {
     foreach ($required as $name) {
@@ -688,7 +692,9 @@ class CRM_Core_Config extends CRM_Core_Config_Variables {
     CRM_Core_DAO::executeQuery($query);
   }
 
-  // This method should initialize auth sources
+  /**
+   * This method should initialize auth sources
+   */
   public function initAuthSrc() {
     $session = CRM_Core_Session::singleton();
     if ($session->get('userID') && !$session->get('authSrc')) {