[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[42941] trunk

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

Revision: 42941
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42941&view=rev
Author:   lphuberdeau
Date:     2012-09-13 16:13:26 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
[FIX]?\194?\160Toolbars broken when accessed from multiple ajax forms

Modified Paths:
--------------
    trunk/lib/parser/parserlib.php
    trunk/lib/wiki/wikilib.php
    trunk/tiki-setup.php

Modified: trunk/lib/parser/parserlib.php
===================================================================
--- trunk/lib/parser/parserlib.php	2012-09-13 15:48:10 UTC (rev 42940)
+++ trunk/lib/parser/parserlib.php	2012-09-13 16:13:26 UTC (rev 42941)
@@ -487,10 +487,6 @@
 
 			if ( $this->plugin_is_editable($plugin_name) && (empty($this->option['preview_mode']) || !$this->option['preview_mode']) && empty($this->option['indexing']) && (empty($this->option['print']) || !$this->option['print']) && !$this->option['suppress_icons'] ) {
 				$headerlib = TikiLib::lib('header');
-				$headerlib->add_jsfile('tiki-jsplugin.php?language='.$prefs['language'], 'dynamic');
-				if ($prefs['wikiplugin_module'] === 'y' && $prefs['wikiplugininline_module'] === 'n') {
-					$headerlib->add_jsfile('tiki-jsmodule.php?language='.$prefs['language'], 'dynamic');
-				}
 				include_once('lib/smarty_tiki/function.icon.php');
 
 				$id = 'plugin-edit-' . $plugin_name . $current_index;

Modified: trunk/lib/wiki/wikilib.php
===================================================================
--- trunk/lib/wiki/wikilib.php	2012-09-13 15:48:10 UTC (rev 42940)
+++ trunk/lib/wiki/wikilib.php	2012-09-13 16:13:26 UTC (rev 42941)
@@ -990,11 +990,7 @@
 		$parserlib = TikiLib::lib('parser');
 
 		if ($with_help) {
-			global $cachelib, $headerlib, $prefs;
-			$headerlib->add_jsfile('tiki-jsplugin.php?language='.$prefs['language'], 'dynamic');
-			if ($prefs['wikiplugin_module'] === 'y' && $prefs['wikiplugininline_module'] === 'n') {
-				$headerlib->add_jsfile('tiki-jsmodule.php?language='.$prefs['language'], 'dynamic');
-			}
+			global $cachelib, $prefs;
 			$cachetag = 'plugindesc' . $this->get_language() . $area_id . '_js=' . $prefs['javascript_enabled'];
 			if (! $plugins = $cachelib->getSerialized($cachetag) ) {
 				$list = $parserlib->plugin_get_list();

Modified: trunk/tiki-setup.php
===================================================================
--- trunk/tiki-setup.php	2012-09-13 15:48:10 UTC (rev 42940)
+++ trunk/tiki-setup.php	2012-09-13 16:13:26 UTC (rev 42941)
@@ -497,6 +497,15 @@
 	);
 }
 
+if (true) {
+	// Before being clever and moving this close to where you think it's needed (again),
+	// consider there are more places that you think.
+	$headerlib->add_jsfile('tiki-jsplugin.php?language='.$prefs['language'], 'dynamic');
+	if ($prefs['wikiplugin_module'] === 'y' && $prefs['wikiplugininline_module'] === 'n') {
+		$headerlib->add_jsfile('tiki-jsmodule.php?language='.$prefs['language'], 'dynamic');
+	}
+}
+
 if ( session_id() ) {
 	if ( $prefs['tiki_cachecontrol_session'] ) {
 		header('Cache-Control: ' . $prefs['tiki_cachecontrol_session']);

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