Fixes #4586 properly accessing ip address in refine form

diff --git a/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php b/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
index 89894e3d25fc6f8b491a463d3c451e403082cef1..2581f954c89694ffd05568d8b99e987ef11e54de 100644 (file)
--- 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 6ec5907b65f0a9959fa22359ef9817202fe38995..3c6528d21113c9b504af4dc8b76f1cf102eecb21 100644 (file)
--- 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(