projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #14316 from eileenmcnaughton/membershipRenewal
[civicrm-core.git]
/
CRM
/
Utils
/
Request.php
diff --git
a/CRM/Utils/Request.php
b/CRM/Utils/Request.php
index 1f5a724d57e65dd6a545d36bb3202502d031ec8a..2f55cea32c37c20e9a75092b28fe092f94c7d82e 100644
(file)
--- a/
CRM/Utils/Request.php
+++ b/
CRM/Utils/Request.php
@@
-116,9
+116,9
@@
class CRM_Utils_Request {
if (!isset($value) && $abort) {
if ($isThrowException) {
if (!isset($value) && $abort) {
if ($isThrowException) {
- throw new CRM_Core_Exception(ts("Could not find valid value for %1",
array(1 => $name)
));
+ throw new CRM_Core_Exception(ts("Could not find valid value for %1",
[1 => $name]
));
}
}
- CRM_Core_Error::fatal(ts("Could not find valid value for %1",
array(1 => $name)
));
+ CRM_Core_Error::fatal(ts("Could not find valid value for %1",
[1 => $name]
));
}
if (!isset($value) && $default) {
}
if (!isset($value) && $default) {
@@
-146,7
+146,7
@@
class CRM_Utils_Request {
* @param array $method - '$_GET', '$_POST' or '$_REQUEST'.
*
* @return mixed
* @param array $method - '$_GET', '$_POST' or '$_REQUEST'.
*
* @return mixed
- *
The value of the variable
+ * The value of the variable
*/
protected static function getValue($name, $method) {
if (isset($method[$name])) {
*/
protected static function getValue($name, $method) {
if (isset($method[$name])) {
@@
-183,7
+183,7
@@
class CRM_Utils_Request {
// http://www.php.net/manual/en/ini.core.php#ini.request-order
// http://www.php.net/manual/en/ini.core.php#ini.variables-order
// http://www.php.net/manual/en/ini.core.php#ini.request-order
// http://www.php.net/manual/en/ini.core.php#ini.variables-order
- $result =
array()
;
+ $result =
[]
;
if ($_GET) {
$result = array_merge($result, $_GET);
}
if ($_GET) {
$result = array_merge($result, $_GET);
}
@@
-235,7
+235,7
@@
class CRM_Utils_Request {
* @param array $attributes
* The form attributes array.
*
* @param array $attributes
* The form attributes array.
*
- * @return string
$value
+ * @return string
* The desired value.
*/
public static function retrieveComponent($attributes) {
* The desired value.
*/
public static function retrieveComponent($attributes) {