Removing changes for CRM-17033

[civicrm-core.git] / CRM / Utils / Request.php

diff --git a/CRM/Utils/Request.php b/CRM/Utils/Request.php
index 7e3c9153aafd408ad8c2f6654df0101ff3acc2ca..ad47d01ad69d97b3937017f660c45a3b796c6137 100644 (file)
--- a/CRM/Utils/Request.php
+++ b/CRM/Utils/Request.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | 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$
  *
  */
@@ -39,36 +39,26 @@
  */
 class CRM_Utils_Request {
 
-  /**
-   * We only need one instance of this object. So we use the singleton
-   * pattern and cache the instance in this variable
-   *
-   * @var object
-   * @access private
-   * @static
-   */
-  static private $_singleton = NULL;
-
-  /**
-   * Class constructor
-   */
-  function __construct() {}
-
   /**
    * Retrieve a value from the request (GET/POST/REQUEST)
    *
-   * @param string $name name of the variable to be retrieved
-   * @param string $type  type of the variable (see CRM_Utils_Type for details)
-   * @param object $store session scope where variable is stored
-   * @param bool $abort is this variable required
-   * @param mixed $default default value of the variable if not present
-   * @param string $method where should we look for the variable
+   * @param string $name
+   *   Name of the variable to be retrieved.
+   * @param string $type
+   *   Type of the variable (see CRM_Utils_Type for details).
+   * @param object $store
+   *   Session scope where variable is stored.
+   * @param bool $abort
+   *   TRUE, if the variable is required.
+   * @param mixed $default
+   *   Default value of the variable if not present.
+   * @param string $method
+   *   Where to look for the variable - 'GET', 'POST' or 'REQUEST'.
    *
-   * @return mixed the value of the variable
-   * @access public
-   * @static
+   * @return mixed
+   *   The value of the variable
    */
-  static function retrieve($name, $type, &$store = NULL, $abort = FALSE, $default = NULL, $method = 'REQUEST') {
+  public static function retrieve($name, $type, &$store = NULL, $abort = FALSE, $default = NULL, $method = 'REQUEST') {
 
     // hack to detect stuff not yet converted to new style
     if (!is_string($type)) {
@@ -127,7 +117,7 @@ class CRM_Utils_Request {
    *
    * @return array
    */
-  static function exportValues() {
+  public static function exportValues() {
     // For more discussion of default $_REQUEST handling, see:
     // http://www.php.net/manual/en/reserved.variables.request.php
     // http://www.php.net/manual/en/ini.core.php#ini.request-order
@@ -142,5 +132,5 @@ class CRM_Utils_Request {
     }
     return $result;
   }
-}
 
+}