summaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-07-23 07:38:26 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-07-23 07:38:26 +0000
commit233ed809a6e22baa798666ac66c7373f500d4060 (patch)
tree70b33c8faab707fc4162b89ce03dc449c395da8a /admin
parent4ad67656eb63a6c23b0e6caed619f463e0c14aec (diff)
downloadampache-233ed809a6e22baa798666ac66c7373f500d4060.tar.gz
ampache-233ed809a6e22baa798666ac66c7373f500d4060.tar.bz2
ampache-233ed809a6e22baa798666ac66c7373f500d4060.zip
fixed ip history display
Diffstat (limited to 'admin')
-rw-r--r--admin/users.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/admin/users.php b/admin/users.php
index 677c9510..dd073e65 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -169,12 +169,14 @@ switch ($_REQUEST['action']) {
case 'show_ip_history':
/* get the user and their history */
$working_user = new User($_REQUEST['user_id']);
+
if (!isset ($_REQUEST['all'])){
- $history = $working_user->get_ip_history('',1);
- } else {
- $history = $working_user->get_ip_history('','');
+ $history = $working_user->get_ip_history('',1);
+ }
+ else {
+ $history = $working_user->get_ip_history('','');
}
- require (conf('prefix') . '/templates/show_ip_history.inc.php');
+ require Config::get('prefix') . '/templates/show_ip_history.inc.php';
break;
case 'show_add_user':
if (Config::get('demo_mode')) { break; }