Merge pull request #1380 from totten/master-reapply-1371

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

diff --git a/CRM/Core/Session.php b/CRM/Core/Session.php
index bb8aeda941a829c32b25873530b64c490198351e..5042bdd8a26dc362f277c5d472f0ae0c10e9eb7f 100644 (file)
--- a/CRM/Core/Session.php
+++ b/CRM/Core/Session.php
@@ -88,7 +88,7 @@ class CRM_Core_Session {
   /**
    * singleton function used to manage this object
    *
-   * @return object
+   * @return CRM_CoreSession
    * @static
    */
   static function &singleton() {
@@ -491,9 +491,7 @@ class CRM_Core_Session {
     $session->initialize();
 
     // default options
-    $options += array(
-      'unique' => TRUE
-    );
+    $options += array('unique' => TRUE);
 
     if (!isset(self::$_singleton->_session[self::$_singleton->_key]['status'])) {
       self::$_singleton->_session[self::$_singleton->_key]['status'] = array();