diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-04-03 03:13:59 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-04-03 03:13:59 +0000 |
| commit | e3bac84877a104467297e3ba791c8cb5c26eb71c (patch) | |
| tree | 150e71be4d61dfb27f892cbd634631b1b1271572 /phpBB/includes/functions_admin.php | |
| parent | 6fbf4b7c1ceaf69534816c7397163d4eef1c234c (diff) | |
| download | forums-e3bac84877a104467297e3ba791c8cb5c26eb71c.tar forums-e3bac84877a104467297e3ba791c8cb5c26eb71c.tar.gz forums-e3bac84877a104467297e3ba791c8cb5c26eb71c.tar.bz2 forums-e3bac84877a104467297e3ba791c8cb5c26eb71c.tar.xz forums-e3bac84877a104467297e3ba791c8cb5c26eb71c.zip | |
Oops. Didn't merge files correctly.
git-svn-id: file:///svn/phpbb/trunk@3787 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index ea7404cbdc..017f965907 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -1491,7 +1491,6 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id if (!empty($row['log_data'])) { -<<<<<<< functions_admin.php $log_data_ary = unserialize(stripslashes($row['log_data'])); foreach ($log_data_ary as $log_data) @@ -1499,12 +1498,6 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id $log[$i]['action'] = preg_replace('#%s#', $log_data, $log[$i]['action'], 1); } } -======= - $log[$i]['id'] = $row['log_id']; - $log[$i]['username'] = '<a href="admin_users.' . $phpEx . $SID . '&u=' . $row['user_id'] . '">' . $row['username'] . '</a>'; - $log[$i]['ip'] = $row['log_ip']; - $log[$i]['time'] = $row['log_time']; ->>>>>>> 1.30 $i++; } |