[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[23538] trunk/lib/wiki

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

Revision: 23538
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=23538&view=rev
Author:   lphuberdeau
Date:     2009-11-26 18:14:59 +0000 (Thu, 26 Nov 2009)

Log Message:
-----------
[FIX] Language was no longer sent to the parser.

Modified Paths:
--------------
    trunk/lib/wiki/renderlib.php
    trunk/lib/wiki/wikilib.php

Modified: trunk/lib/wiki/renderlib.php
===================================================================
--- trunk/lib/wiki/renderlib.php	2009-11-26 16:56:43 UTC (rev 23537)
+++ trunk/lib/wiki/renderlib.php	2009-11-26 18:14:59 UTC (rev 23538)
@@ -297,23 +297,21 @@
 		$this->smartyassign('wiki_authors_style', $wiki_authors_style);
 
 		$this->smartyassign('cached_page','n');
-		$parse_options = array(
-			'is_html' => $this->info['is_html'],
-			'language' => $this->info['lang']
-		);
 
-		if($prefs['wiki_cache']>0 and (is_null($user) or $user == '')) {
-			$this->setPref( 'wiki_cache', $this->info['wiki_cache'] );
-		}
-
 		if ($this->content_to_render == '') {
 			$pdata = $wikilib->get_parse($this->page, $canBeRefreshed);
+
+			if ($canBeRefreshed) {
+				$this->smartyassign('cached_page','y');
+			}
 		} else {
-			$pdata = $wikilib->parse_data($this->content_to_render);
+			$parse_options = array(
+				'is_html' => $this->info['is_html'],
+				'language' => $this->info['lang']
+			);
+
+			$pdata = $wikilib->parse_data($this->content_to_render, $parse_options);
 		}
-		if ($canBeRefreshed) {
-			$this->smartyassign('cached_page','y');
-		}
 
 		$pages = $wikilib->get_number_of_pages($pdata);
 		$pdata = $wikilib->get_page($pdata,$this->pageNumber);

Modified: trunk/lib/wiki/wikilib.php
===================================================================
--- trunk/lib/wiki/wikilib.php	2009-11-26 16:56:43 UTC (rev 23537)
+++ trunk/lib/wiki/wikilib.php	2009-11-26 18:14:59 UTC (rev 23538)
@@ -370,7 +370,11 @@
 			} else {
 				$info = $this->get_page_info($page);
 				if (!empty($info)) {
-					$content = $this->parse_data($info['data'],  array('is_html' => $info['is_html']));
+					$parse_options = array(
+						'is_html' => $info['is_html'],
+						'language' => $info['lang'],
+					);
+					$content = $this->parse_data($info['data'], $parse_options );
 					if (!empty($info['wiki_cache'])) {
 						$this->update_cache($page, $content);
 					}
@@ -379,7 +383,11 @@
 		} else {
 			$info = $this->get_page_info($page);
 			if (!empty($info)) {
-				$content = $this->parse_data($info['data'], array('is_html' => $info['is_html']));
+				$parse_options = array(
+					'is_html' => $info['is_html'],
+					'language' => $info['lang'],
+				);
+				$content = $this->parse_data($info['data'], $parse_options );
 			}
 		}
 		return $content;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.