minor fix

minor fix

fix syntax error

minor fix

diff --git a/CRM/Utils/Request.php b/CRM/Utils/Request.php
index a5357f85f35e00c9b1ad7f2e4d5a5ce356e2919d..f5fd4b14b7218253551a19a99b54c2bdad56a95f 100644 (file)
--- a/CRM/Utils/Request.php
+++ b/CRM/Utils/Request.php
@@ -146,14 +146,22 @@ class CRM_Utils_Request {
    *    The value of the variable
    */
   public static function getValue($name, $method) {
+    if (isset($method[$name])) {
+      return $method[$name];
+    }
     // CRM-18384 - decode incorrect keys generated when & is present in url
     foreach ($method as $key => $value) {
-      if (strpos($key, 'amp;') !== false) {
+      if (strpos($key, 'amp;') !== FALSE) {
         $method[str_replace('amp;', '', $key)] = $method[$key];
-        unset($method[$key]);
+        if (isset($method[$name])) {
+          return $method[$name];
+        }
+        else {
+          continue;
+        }
       }
     }
-    return CRM_Utils_Array::value($name, $method);
+    return NULL;
   }
 
   /**