[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[42327] branches/9.x/installer/schema

[<jon...@us...>]

Revision: 42327
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42327&view=rev
Author:   jonnybradley
Date:     2012-07-10 13:01:10 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
[FIX] install: Missing globals and tikilib setup on php upgrade scripts (found when upgrading from tiki 3 to 9 - thanks marclaporte)

Modified Paths:
--------------
    branches/9.x/installer/schema/999999991_decode_pages_sources_tiki.php
    branches/9.x/installer/schema/99999999_image_plugins_kill_tiki.php

Modified: branches/9.x/installer/schema/999999991_decode_pages_sources_tiki.php
===================================================================
--- branches/9.x/installer/schema/999999991_decode_pages_sources_tiki.php	2012-07-10 12:31:38 UTC (rev 42326)
+++ branches/9.x/installer/schema/999999991_decode_pages_sources_tiki.php	2012-07-10 13:01:10 UTC (rev 42327)
@@ -26,6 +26,7 @@
 
 function upgrade_999999991_decode_pages_sources_tiki($installer)
 {
+	global $user_overrider_prefs;
 	set_time_limit(60 * 60); // Set maximum execution time to 1 hour since this runs on all pages
 	include_once('tiki-setup_base.php');
 	include_once ('lib/categories/categlib.php');	// needed for cat_jail fn in list_pages()

Modified: branches/9.x/installer/schema/99999999_image_plugins_kill_tiki.php
===================================================================
--- branches/9.x/installer/schema/99999999_image_plugins_kill_tiki.php	2012-07-10 12:31:38 UTC (rev 42326)
+++ branches/9.x/installer/schema/99999999_image_plugins_kill_tiki.php	2012-07-10 13:01:10 UTC (rev 42327)
@@ -10,9 +10,6 @@
   exit;
 }
 
-global $tikilib, $prefs, $tikiroot, $user_overrider_prefs, $tiki_p_trust_input, $smarty, $access, $local_php;	// globals are required here for tiki-setup_base.php
-include_once('tiki-setup_base.php');
-
 // ABOUT THE NUMBERING:
 //
 // Because this script calls tiki-setup_base.php , which does very
@@ -23,8 +20,13 @@
 
 function upgrade_99999999_image_plugins_kill_tiki($installer)
 {
-	global $tikilib, $installer;
+	global $tikilib, $prefs, $tikiroot, $user_overrider_prefs, $tiki_p_trust_input, $smarty, $access, $local_php;	// globals are required here for tiki-setup_base.php
 
+	require_once ('db/tiki-db.php');
+	require_once ('lib/tikilib.php');
+
+	$tikilib = new TikiLib;
+
 	include_once ('lib/profilelib/profilelib.php');
 	include_once ('lib/profilelib/installlib.php');
 

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