aboutsummaryrefslogtreecommitdiff
path: root/mod/logbrowser/views
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-06-16 17:36:56 -0400
committerCash Costello <cash.costello@gmail.com>2012-06-16 17:36:56 -0400
commit61bc345d16a51c44078d684032ec50bb16b2bc47 (patch)
tree63bf06a6c78d2ea1d815c1e06e3a59047e3dd78f /mod/logbrowser/views
parent65c3cca827ba5471cc1a49ad13178fc1aba6c964 (diff)
downloadelgg-61bc345d16a51c44078d684032ec50bb16b2bc47.tar.gz
elgg-61bc345d16a51c44078d684032ec50bb16b2bc47.tar.bz2
Fixes #4586 properly accessing ip address in refine form
Diffstat (limited to 'mod/logbrowser/views')
-rw-r--r--mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php1
-rw-r--r--mod/logbrowser/views/default/forms/logbrowser/refine.php7
2 files changed, 5 insertions, 3 deletions
diff --git a/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php b/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
index 89894e3d2..2581f954c 100644
--- a/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
+++ b/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
@@ -41,6 +41,7 @@ $refine = elgg_view('logbrowser/refine', array(
'user_guid' => $user_guid,
'timeupper' => $timeupper,
'timelower' => $timelower,
+ 'ip_address' => $ip_address,
));
// Get log entries
diff --git a/mod/logbrowser/views/default/forms/logbrowser/refine.php b/mod/logbrowser/views/default/forms/logbrowser/refine.php
index 6ec5907b6..3c6528d21 100644
--- a/mod/logbrowser/views/default/forms/logbrowser/refine.php
+++ b/mod/logbrowser/views/default/forms/logbrowser/refine.php
@@ -6,15 +6,16 @@
* @uses $vars['user_guid']
* @uses $vars['timelower']
* @uses $vars['timeupper']
+ * @uses $vars['ip_address']
*/
if (isset($vars['timelower'])) {
- $lowerval = date('r',$vars['timelower']);
+ $lowerval = date('r', $vars['timelower']);
} else {
$lowerval = "";
}
if (isset($vars['timeupper'])) {
- $upperval = date('r',$vars['timeupper']);
+ $upperval = date('r', $vars['timeupper']);
} else {
$upperval = "";
}
@@ -26,7 +27,7 @@ if (isset($vars['user_guid'])) {
} else {
$userval = "";
}
-$ip_address = elgg_extract('ip_address', '');
+$ip_address = elgg_extract('ip_address', $vars);
$form = "<div>" . elgg_echo('logbrowser:user');
$form .= elgg_view('input/text', array(