[Tikiwiki-cvs] tiki/lib/multilingual multilinguallib.php, 1.18.2.11, 1.18.2.12

[<lph...@us...>]

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

Modified Files:
      Tag: BRANCH-1-10
	multilinguallib.php 
Log Message:
[FIX] Best/Worst page source version look-up has to be directional.


Index: multilinguallib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/multilingual/multilinguallib.php,v
retrieving revision 1.18.2.11
retrieving revision 1.18.2.12
diff -u -d -r1.18.2.11 -r1.18.2.12
--- multilinguallib.php	5 Feb 2008 15:12:46 -0000	1.18.2.11
+++ multilinguallib.php	5 Feb 2008 16:32:26 -0000	1.18.2.12
@@ -624,14 +624,14 @@
 			SELECT DISTINCT
 				page.pageName page,
 				IFNULL( (
-					SELECT MAX(source.version)
+					SELECT IF( MAX(source.version) > MAX(back.version), MAX(source.version), MAX(back.version) )
 					FROM
-						tiki_pages_translation_bits source
-						INNER JOIN tiki_pages_translation_bits target
-							ON source.translation_bit_id = target.source_translation_bit
+						tiki_pages_translation_bits target
+						LEFT JOIN tiki_pages_translation_bits source ON source.translation_bit_id = target.source_translation_bit
+						LEFT JOIN tiki_pages_translation_bits back ON target.translation_bit_id = back.source_translation_bit
 					WHERE
-						source.page_id = b.objId
-						AND target.page_id = page.page_id
+						target.page_id = b.objId
+						AND ( source.page_id = a.objId OR back.page_id = a.objId )
 				), 1) last_update,
 				page.version current_version,
 				page.lang
@@ -665,13 +665,14 @@
 			SELECT DISTINCT
 				page.pageName page,
 				IFNULL( (
-					SELECT MAX(source.version)
+					SELECT IF( MAX(source.version) > MAX(back.version), MAX(source.version), MAX(back.version) )
 					FROM
-						tiki_pages_translation_bits source
-						INNER JOIN tiki_pages_translation_bits target ON source.translation_bit_id = target.source_translation_bit
+						tiki_pages_translation_bits target
+						LEFT JOIN tiki_pages_translation_bits source ON source.translation_bit_id = target.source_translation_bit
+						LEFT JOIN tiki_pages_translation_bits back ON target.translation_bit_id = back.source_translation_bit
 					WHERE
-						source.page_id = a.objId
-						AND target.page_id = b.objId
+						target.page_id = a.objId
+						AND ( back.page_id = b.objId OR source.page_id = b.objId )
 				), 1) last_update,
 				page.lang
 			FROM