aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-09-29 09:31:50 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-09-29 09:31:50 +0000
commita71a4e9753bf7a98049b0e8b1793012cfe6da673 (patch)
treed7b3d0c3f42ba4fc71f7d04613990151b0f8dbb9 /engine/lib
parent956717eb3b602579165d9b8983b3205361b0e845 (diff)
downloadelgg-a71a4e9753bf7a98049b0e8b1793012cfe6da673.tar.gz
elgg-a71a4e9753bf7a98049b0e8b1793012cfe6da673.tar.bz2
get_input can now be properly overridden by set_input. Fixes #324
git-svn-id: https://code.elgg.org/elgg/trunk@2142 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib')
-rw-r--r--engine/lib/input.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/lib/input.php b/engine/lib/input.php
index 2b72c5264..23fa4b8b8 100644
--- a/engine/lib/input.php
+++ b/engine/lib/input.php
@@ -21,6 +21,11 @@
function get_input($variable, $default = "", $filter_result = true)
{
+ global $CONFIG;
+
+ if (isset($CONFIG->input[$variable]))
+ return $CONFIG->input[$variable];
+
if (isset($_REQUEST[$variable])) {
if (is_array($_REQUEST[$variable])) {
@@ -40,11 +45,6 @@
return $var;
}
-
- global $CONFIG;
-
- if (isset($CONFIG->input[$variable]))
- return $CONFIG->input[$variable];
return $default;