[phpBT-dev] CVS: phpbt bug.php,1.134.2.4,1.134.2.5

[Benjamin C. <bc...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17528

Modified Files:
      Tag: htmltemplates
	bug.php 
Log Message:
Removing the references to $STRING

Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.134.2.4
retrieving revision 1.134.2.5
diff -u -r1.134.2.4 -r1.134.2.5
--- bug.php	3 May 2004 13:34:37 -0000	1.134.2.4
+++ bug.php	20 Jun 2004 23:14:23 -0000	1.134.2.5
@@ -27,7 +27,7 @@
 ///
 /// View the votes for a bug
 function vote_view($bug_id) {
-	global $u, $db, $t, $STRING;
+	global $u, $db, $t;
 
 	$t->assign('votes', $db->getAll('select login, v.created_date '.'from '.TBL_AUTH_USER.' u, '.TBL_BUG_VOTE." v where u.user_id = v.user_id and bug_id = $bug_id order by v.created_date"));
 	$t->render('bugvotes.html', translate("Bug Votes"));
@@ -95,7 +95,7 @@
 ///
 /// Show the activity for a bug
 function show_history($bugid) {
-	global $db, $t, $STRING, $QUERY;
+	global $db, $t, $QUERY;
 
 	if (!is_numeric($bugid)) {
 		show_text(translate("There is no history for this bug"));
@@ -109,7 +109,7 @@
 ///
 /// Send the email about changes to the bug and log the changes in the DB
 function do_changedfields($userid, &$buginfo, $cf = array(), $comments = '') {
-	global $db, $t, $u, $select, $now, $STRING, $QUERY;
+	global $db, $t, $u, $select, $now, $QUERY;
 
 	// It's a new bug if the changedfields array is empty and there are no comments
 	$newbug = (!count($cf) and !$comments);
@@ -155,7 +155,7 @@
 		    $newvalue = $db->getOne("select ${field}_name from $table where ${field}_id = {$cf[$field.'_id']}");
 		    if (empty($newvalue)) $newvalue = 'None';
 
-		    $db->query('insert into '.TBL_BUG_HISTORY.' (bug_id, changed_field, old_value, new_value, created_by, created_date) values ('. join(', ', array($buginfo['bug_id'], $db->quote($STRING['BUGDISPLAY'][$field]), $db->quote(stripslashes($oldvalue)), $db->quote(stripslashes($newvalue)), $u, $now)).")");
+		    $db->query('insert into '.TBL_BUG_HISTORY.' (bug_id, changed_field, old_value, new_value, created_by, created_date) values ('. join(', ', array($buginfo['bug_id'], $db->quote(translate($field)), $db->quote(stripslashes($oldvalue)), $db->quote(stripslashes($newvalue)), $u, $now)).")");
 		    $t->assign(array(
 				$field.'_id' => stripslashes($newvalue),
 				$field.'_id_stat' => '!'
@@ -182,7 +182,7 @@
 		    $newvalue = $db->getOne('select version_name from '.$cfgDatabase['version'].' where version_id = '.$cf[$field.'_id']);
 			if (empty($newvalue)) $newvalue = 'None';
 
-		    $db->query('insert into '.TBL_BUG_HISTORY.' (bug_id, changed_field, old_value, new_value, created_by, created_date) values ('. join(', ', array($buginfo['bug_id'], $db->quote($STRING['BUGDISPLAY'][$field_name]),
+		    $db->query('insert into '.TBL_BUG_HISTORY.' (bug_id, changed_field, old_value, new_value, created_by, created_date) values ('. join(', ', array($buginfo['bug_id'], $db->quote(translate($field_name)),
 				$db->quote(stripslashes($oldvalue)),
 				$db->quote(stripslashes($newvalue)), $u, $now)).")");
 		    $t->assign(array(
@@ -206,7 +206,7 @@
 		if (is_null($oldassignedto)) {
 			$oldassignedto = '';
 		}
-		$db->query('insert into '.TBL_BUG_HISTORY.' (bug_id, changed_field, old_value, new_value, created_by, created_date) values ('. join(', ', array($buginfo['bug_id'], $db->quote($STRING['BUGDISPLAY']['assignedto']), $db->quote($oldassignedto), $db->quote($assignedto), $u, $now)).")");
+		$db->query('insert into '.TBL_BUG_HISTORY.' (bug_id, changed_field, old_value, new_value, created_by, created_date) values ('. join(', ', array($buginfo['bug_id'], $db->quote(translate("Assigned To")), $db->quote($oldassignedto), $db->quote($assignedto), $u, $now)).")");
 	} else {
 		$assignedtostat = ' ';
 	}