[Tikiwiki-cvs] tiki tiki-editpage.php, 1.181.2.10, 1.181.2.11 tiki-index.php, 1.198.2.3, 1.198.2.4

[<nk...@us...>]

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

Modified Files:
      Tag: BRANCH-1-10
	tiki-editpage.php tiki-index.php 
Log Message:
[FIX] out of sync indicator for staging/approve should be available for both staging/approved page.

Index: tiki-editpage.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-editpage.php,v
retrieving revision 1.181.2.10
retrieving revision 1.181.2.11
diff -u -d -r1.181.2.10 -r1.181.2.11
--- tiki-editpage.php	22 Nov 2007 21:43:15 -0000	1.181.2.10
+++ tiki-editpage.php	22 Nov 2007 21:54:31 -0000	1.181.2.11
@@ -912,10 +912,10 @@
 	include_once('contribution.php');
 }
 if ($prefs['feature_wikiapproval'] == 'y') {
+	if ($prefs['wikiapproval_outofsync_category'] > 0 && in_array($prefs['wikiapproval_outofsync_category'], $cats)) {
+		$smarty->assign('outOfSync', 'y');
+	}
 	if (substr($page, 0, strlen($prefs['wikiapproval_prefix'])) == $prefs['wikiapproval_prefix']) {
-		if ($prefs['wikiapproval_outofsync_category'] > 0 && in_array($prefs['wikiapproval_outofsync_category'], $cats)) {
-			$smarty->assign('outOfSync', 'y');
-		}
 		$approvedPageName = substr($page, strlen($prefs['wikiapproval_prefix']));	
 		$smarty->assign('beingStaged', 'y');
 		$smarty->assign('approvedPageName', $approvedPageName);

Index: tiki-index.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-index.php,v
retrieving revision 1.198.2.3
retrieving revision 1.198.2.4
diff -u -d -r1.198.2.3 -r1.198.2.4
--- tiki-index.php	22 Nov 2007 21:43:15 -0000	1.198.2.3
+++ tiki-index.php	22 Nov 2007 21:54:31 -0000	1.198.2.4
@@ -655,10 +655,10 @@
 }
 
 if ($prefs['feature_wikiapproval'] == 'y') {
+	if ($prefs['wikiapproval_outofsync_category'] > 0 && in_array($prefs['wikiapproval_outofsync_category'], $cats)) {
+		$smarty->assign('outOfSync', 'y');
+	}
 	if (substr($page, 0, strlen($prefs['wikiapproval_prefix'])) == $prefs['wikiapproval_prefix']) {
-		if ($prefs['wikiapproval_outofsync_category'] > 0 && in_array($prefs['wikiapproval_outofsync_category'], $cats)) {
-			$smarty->assign('outOfSync', 'y');
-		}
 		$approvedPageName = substr($page, strlen($prefs['wikiapproval_prefix']));	
 		$smarty->assign('beingStaged', 'y');
 		$smarty->assign('approvedPageName', $approvedPageName);