Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-01-22-48-29

[civicrm-core.git] / CRM / Extension / System.php

diff --git a/CRM/Extension/System.php b/CRM/Extension/System.php
index a9c099d24b77116b5423eda6fcf1038da96a04f7..3d531807fc6c2bb35f7bde01b76352cdd412a4c4 100644 (file)
--- a/CRM/Extension/System.php
+++ b/CRM/Extension/System.php
@@ -53,6 +53,8 @@ class CRM_Extension_System {
   private $_repoUrl = NULL;
 
   /**
+   * @param bool $fresh
+   *
    * @return CRM_Extension_System
    */
   public static function singleton($fresh = FALSE) {
@@ -66,10 +68,16 @@ class CRM_Extension_System {
     return self::$singleton;
   }
 
+  /**
+   * @param CRM_Extension_System $singleton
+   */
   public static function setSingleton(CRM_Extension_System $singleton) {
     self::$singleton = $singleton;
   }
 
+  /**
+   * @param array $parameters
+   */
   public function __construct($parameters = array()) {
     $config = CRM_Core_Config::singleton();
     if (!array_key_exists('extensionsDir', $parameters)) {