[Tikiwiki-cvs] tiki tiki-admin_trackers.php,1.58,1.59

[<sy...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27582

Modified Files:
	tiki-admin_trackers.php 
Log Message:
Instant-Auto-Merge from BRANCH-1-9 to HEAD

Index: tiki-admin_trackers.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_trackers.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- tiki-admin_trackers.php	10 Jul 2007 11:06:01 -0000	1.58
+++ tiki-admin_trackers.php	12 Jul 2007 16:07:08 -0000	1.59
@@ -70,6 +70,11 @@
 	} else {
 		$tracker_options["showCreated"] = 'n';
 	}
+	if (isset($_REQUEST['showCreatedFormat'])) {
+		$tracker_options['showCreatedFormat'] = $_REQUEST['showCreatedFormat'];
+	} else {
+		$tracker_options['showCreatedFormat'] = '';
+	}
 	if (isset($_REQUEST["showCreatedView"]) 
 		&& ($_REQUEST["showCreatedView"] == 'on' 
 			or $_REQUEST["showCreatedView"] == 'y')) {
@@ -179,6 +184,11 @@
 	} else {
 		$tracker_options["showLastModif"] = 'n';
 	}
+	if (isset($_REQUEST['showLastModifFormat'])) {
+		$tracker_options['showLastModifFormat'] = $_REQUEST['showLastModifFormat'];
+	} else {
+		$tracker_options['showLastModifFormat'] = '';
+	}
 	if (isset($_REQUEST["showLastModifView"]) 
 		&& ($_REQUEST["showLastModifView"] == 'on'
 			or $_REQUEST["showLastModifView"] == 'y')) {
@@ -343,6 +353,7 @@
 $info["name"] = '';
 $info["description"] = '';
 $info["showCreated"] = '';
+$info['showCreatedFormat'] = '';
 $info["showCreatedView"] = '';
 $info["useExplicitNames"] = '';
 $info['doNotShowEmptyField'] = '';
@@ -353,6 +364,7 @@
 $info["outboundEmail"] = '';
 $info["newItemStatus"] = '';
 $info["showLastModif"] = '';
+$info["showLastModifFormat"] = '';
 $info["showLastModifView"] = '';
 $info["useRatings"] = '';
 $info["ratingOptions"] = '';
@@ -390,6 +402,7 @@
 $smarty->assign('name', $info["name"]);
 $smarty->assign('description', $info["description"]);
 $smarty->assign('showCreated', $info["showCreated"]);
+$smarty->assign('showCreatedFormat', $info['showCreatedFormat']);
 $smarty->assign('showCreatedView', $info["showCreatedView"]);
 $smarty->assign('useExplicitNames', $info["useExplicitNames"]);
 $smarty->assign('doNotShowEmptyField', $info['doNotShowEmptyField']);
@@ -400,6 +413,7 @@
 $smarty->assign('outboundEmail', $info["outboundEmail"]);
 $smarty->assign('newItemStatus', $info["newItemStatus"]);
 $smarty->assign('showLastModif', $info["showLastModif"]);
+$smarty->assign('showLastModifFormat', $info["showLastModifFormat"]);
 $smarty->assign('showLastModifView', $info["showLastModifView"]);
 $smarty->assign('useRatings', $info["useRatings"]);
 $smarty->assign('ratingOptions', $info["ratingOptions"]);