X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FGlobalStack.php;h=a8bcb2828ebda12ef4e2b49ddfbd2732c982dc83;hb=23de1ac098f62001327fc1bd6aac2db04ee327a3;hp=2e7c133a929631a5bb9a408133f5c87be9fa8987;hpb=24f8127938dec80960d388e50fd5b89aa450b494;p=civicrm-core.git

diff --git a/CRM/Utils/GlobalStack.php b/CRM/Utils/GlobalStack.php
index 2e7c133a92..a8bcb2828e 100644
--- a/CRM/Utils/GlobalStack.php
+++ b/CRM/Utils/GlobalStack.php
@@ -1,8 +1,8 @@
 <?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.                                    |
  |                                                                    |
@@ -22,7 +22,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Temporarily change a global variable.
@@ -46,14 +46,13 @@ class CRM_Utils_GlobalStack {
    * We don't have a container or dependency-injection, so use singleton instead
    *
    * @var object
-   * @static
    */
   private static $_singleton = NULL;
 
   private $backups = array();
 
   /**
-   * Get or set the single instance of CRM_Utils_GlobalStack
+   * Get or set the single instance of CRM_Utils_GlobalStack.
    *
    * @return CRM_Utils_GlobalStack
    */
@@ -77,8 +76,10 @@ class CRM_Utils_GlobalStack {
   }
 
   /**
-   * @param array $new the new, incoming frame
-   * @return array frame
+   * @param array $new
+   *   The new, incoming frame.
+   * @return array
+   *   frame
    */
   public function createBackup($new) {
     $frame = array();
@@ -87,7 +88,8 @@ class CRM_Utils_GlobalStack {
         foreach ($values as $key => $value) {
           $frame[$globalKey][$key] = CRM_Utils_Array::value($key, $GLOBALS[$globalKey]);
         }
-      } else {
+      }
+      else {
         $frame[$globalKey] = CRM_Utils_Array::value($globalKey, $GLOBALS);
       }
     }
@@ -103,9 +105,11 @@ class CRM_Utils_GlobalStack {
         foreach ($values as $key => $value) {
           $GLOBALS[$globalKey][$key] = $value;
         }
-      } else {
+      }
+      else {
         $GLOBALS[$globalKey] = $values;
       }
     }
   }
+
 }