mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 07:08:09 +01:00
Code Issues Releases Wiki Activity

Oops. Didn't merge files correctly.

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@3787 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Ludovic Arnaud 2003-04-03 03:13:59 +00:00
parent 6fbf4b7c1c
commit e3bac84877
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/functions_admin.php
View File

@ -1491,7 +1491,6 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
if (!empty($row['log_data'])) if (!empty($row['log_data']))
{ {
<<<<<<< functions_admin.php
$log_data_ary = unserialize(stripslashes($row['log_data'])); $log_data_ary = unserialize(stripslashes($row['log_data']));
foreach ($log_data_ary as $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]['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 . '&amp;u=' . $row['user_id'] . '">' . $row['username'] . '</a>';
$log[$i]['ip'] = $row['log_ip'];
$log[$i]['time'] = $row['log_time'];
>>>>>>> 1.30
$i++; $i++;
} }