[Tikiwiki-cvs] tiki/lib/multilingual multilinguallib.php,1.14,1.15

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

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

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

Index: multilinguallib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/multilingual/multilinguallib.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- multilinguallib.php	18 May 2005 11:01:05 -0000	1.14
+++ multilinguallib.php	27 Oct 2005 20:12:32 -0000	1.15
@@ -25,8 +25,13 @@
 		if (!$srcTrads && !$objTrads) {
 			$query = "insert into `tiki_translated_objects` (`type`,`objId`,`lang`) values (?,?,?)";
 			$this->query($query, array($type, $srcId, $srcLang));
-			$query = "insert into `tiki_translated_objects` (`type`,`objId`,`traId`,`lang`) values (?,?,last_insert_id(),?)";
-			$this->query($query, array($type, $objId, $objLang));
+			$query = "select max(`traId`) from `tiki_translated_objects` where `type`=? and `objId`=?";
+			$tmp_traId = $this->getOne($query, array( $type, $srcId ) );
+			$query = "insert into `tiki_translated_objects` (`type`,`objId`,`traId`,`lang`) values (?,?,?,?)";
+			$this->query($query, array($type, $objId, $tmp_traId, $objLang));
+			//last_insert_id is not postgres compatible
+			//$query = "insert into `tiki_translated_objects` (`type`,`objId`,`traId`,`lang`) values (?,?,last_insert_id(),?)";
+			//$this->query($query, array($type, $objId, $objLang));
 			return  null;
 		}
 		elseif (!$srcTrads) {
@@ -91,11 +96,10 @@
 	 */
 	function getTranslations($type, $objId, $objName, $objLang, $long=false) {
 		if ($type == 'wiki page') {
-			//$query = "select t2.`objId`, t2.`lang`, p.`pageName`as objName from `tiki_translated_objects` as t1, `tiki_translated_objects` as t2, `tiki_pages` as p where t1.`traId`=t2.`traId` and t2.`objId`!= t1.`objId` and t1.`type`=? and  t1.`objId`=? and p.`page_id`=t2.`objId";
-			$query = "select t2.`objId`, t2.`lang`, p.`pageName`as objName from `tiki_translated_objects` as t1, `tiki_translated_objects` as t2 LEFT JOIN `tiki_pages` p ON p.`page_id`=t2.`objId` where t1.`traId`=t2.`traId` and t2.`objId`!= t1.`objId` and t1.`type`=? and  t1.`objId`=?";
+			$query = "select t2.`objId`, t2.`lang`, p.`pageName`as `objName` from `tiki_translated_objects` as t1, `tiki_translated_objects` as t2 LEFT JOIN `tiki_pages` p ON p.`page_id`=t2.`objId` where t1.`traId`=t2.`traId` and t2.`objId`!= t1.`objId` and t1.`type`=? and  t1.`objId`=?";
 		}
 		elseif ($long) {
-			$query = "select t2.`objId`, t2.`lang`, a.`title` as objName from `tiki_translated_objects` as t1, `tiki_translated_objects` as t2, `tiki_articles` as a where t1.`traId`=t2.`traId` and t2.`objId`!= t1.`objId` and t1.`type`=? and  t1.`objId`=? and a.`articleId`=t2.`objId`";
+			$query = "select t2.`objId`, t2.`lang`, a.`title` as `objName` from `tiki_translated_objects` as t1, `tiki_translated_objects` as t2, `tiki_articles` as a where t1.`traId`=t2.`traId` and t2.`objId`!= t1.`objId` and t1.`type`=? and  t1.`objId`=? and a.`articleId`=t2.`objId`";
 		}
 		else {
 			$query = "select t2.`objId`, t2.`lang` from `tiki_translated_objects` as t1, `tiki_translated_objects` as t2 where t1.`traId`=t2.`traId` and t2.`objId`!= t1.`objId` and t1.`type`=? and  t1.`objId`=?";