Update showhistory.php

diff --git a/showhistory.php b/showhistory.php
index cc5129d69fa0636dd08d8c23407a35e490f0f702..b1c479efe7f70db9156b1e406a97fca6513a8c47 100644 (file)
--- a/showhistory.php
+++ b/showhistory.php
@@ -60,7 +60,7 @@ $customfields = $db->query("
        LEFT JOIN " . TABLE_PREFIX . "bugfieldpermission AS permission
                ON (bugfield.fieldid = permission.fieldid)
        WHERE mask <> 0
-       AND permission.usergroupid IN ({bugdar::$userinfo['usergroupid']}" . (sizeof(bugdar::$userinfo['groupids']) != 0 ? ',' . implode(',', bugdar::$userinfo['groupids']) : '') . ")
+       AND permission.usergroupid IN (" . bugdar::$userinfo['usergroupid'] . (sizeof(bugdar::$userinfo['groupids']) != 0 ? ',' . implode(',', bugdar::$userinfo['groupids']) : '') . ")
        GROUP BY (bugfield.fieldid)"
 );
 
@@ -96,6 +96,7 @@ foreach ($logs AS $dateline => $logitems)
 {
        $show['group'] = true;
        
+       $history = '';
        foreach ($logitems AS $log)
        {
                if ($log['field'] == '.' OR ($log['original'] == '' AND $log['changed'] == ''))
@@ -140,28 +141,32 @@ foreach ($logs AS $dateline => $logitems)
                        {
                                if ($log['original'])
                                {
-                                       $user = new UserAPI($bugsys);
+                                       $user = new UserAPI();
                                        $user->set('userid', $log['original']);
-                                       $user->set_condition();
+                                       $user->setCondition();
                                        $user->fetch();
-                                       $log['original'] = construct_user_display($user->objdata);
+                                       $log['original'] = construct_user_display($user->record);
                                }
                                
                                if ($log['changed'])
                                {
-                                       $user = new UserAPI($bugsys);
+                                       $user = new UserAPI();
                                        $user->set('userid', $log['changed']);
-                                       $user->set_condition();
+                                       $user->setCondition();
                                        $user->fetch();
-                                       $log['changed'] = construct_user_display($user->objdata);
+                                       $log['changed'] = construct_user_display($user->record);
                                }
                        }
                }
                
                BSFunctions::swap_css_classes('', 'altcolor');
-               $bgcolor = BSFunctions::$cssClass;
                
-               eval('$history .= "' . $template->fetch('history_bit') . '";');
+               $tpl = new BSTemplate('history_bit');
+               $tpl->vars = array(
+                       'bgcolor'       => BSFunctions::$cssClass,
+                       'log'           => $log
+               );
+               $history .= $tpl->evaluate()->getTemplate();
                $show['group'] = false;
        }
 }
@@ -172,7 +177,12 @@ if (sizeof($toKill) > 0)
        $db->query("DELETE FROM " . TABLE_PREFIX . "history WHERE historyid IN (" . implode(',', $toKill) . ")");
 }
 
-eval('$template->flush("' . $template->fetch('history') . '");');
+$tpl = new BSTemplate('history');
+$tpl->vars = array(
+       'history'       => $history,
+       'bug'           => $bug
+);
+$tpl->evaluate()->flush();
 
 /*=====================================================================*\
 || ###################################################################

diff --git a/templates/history.tpl b/templates/history.tpl
index a38d9c83edc4d87561f188032c8a542a19725246..d7ab840adc8c263738dd5ee0605a3470a0404d84 100644 (file)
--- a/templates/history.tpl
+++ b/templates/history.tpl
@@ -9,7 +9,7 @@
 
 <%- $header %>
 
-<h2><lang 1="$bug[summary]" 2="$bug[bugid]">{@"History for <a href="showreport.php?bugid=%2$d"><em>%1$s</em></a> (bugid: %2$s)"}</lang></h2>
+<h2><%- sprintf(T('History for <a href="showreport.php?bugid=%2$d"><em>%1$s</em></a> (bugid: %2$s)'), $bug['summary'], $bug['bugid']) %></h2>
 
 <table class="table">
 <tr class="listinghead">