From: <jon...@us...> - 2012-04-06 19:41:08
|
Revision: 40781 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40781&view=rev Author: jonnybradley Date: 2012-04-06 19:41:02 +0000 (Fri, 06 Apr 2012) Log Message: ----------- [FIX] unit tests: Pass on $local_php to upgrade php scripts so they use the correct database in tests for updates and declare $smarty global Modified Paths: -------------- branches/9.x/installer/schema/999999991_decode_pages_sources_tiki.php branches/9.x/installer/schema/99999999_image_plugins_kill_tiki.php branches/9.x/lib/test/bootstrap.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-04-06 19:41:00 UTC (rev 40780) +++ branches/9.x/installer/schema/999999991_decode_pages_sources_tiki.php 2012-04-06 19:41:02 UTC (rev 40781) @@ -10,7 +10,7 @@ exit; } -global $tikilib, $prefs, $tikiroot, $user_overrider_prefs, $tiki_p_trust_input, $smarty, $access; // globals are required here for tiki-setup_base.php +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: Modified: branches/9.x/installer/schema/99999999_image_plugins_kill_tiki.php =================================================================== --- branches/9.x/installer/schema/99999999_image_plugins_kill_tiki.php 2012-04-06 19:41:00 UTC (rev 40780) +++ branches/9.x/installer/schema/99999999_image_plugins_kill_tiki.php 2012-04-06 19:41:02 UTC (rev 40781) @@ -10,7 +10,7 @@ exit; } -global $tikilib, $prefs, $tikiroot, $user_overrider_prefs, $tiki_p_trust_input; // globals are required here for tiki-setup_base.php +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: Modified: branches/9.x/lib/test/bootstrap.php =================================================================== --- branches/9.x/lib/test/bootstrap.php 2012-04-06 19:41:00 UTC (rev 40780) +++ branches/9.x/lib/test/bootstrap.php 2012-04-06 19:41:02 UTC (rev 40781) @@ -32,7 +32,10 @@ die("\nYou need to setup a new database and create a local.php file for the test suite inside " . dirname(__FILE__) . "\n\n"); } -require_once(dirname(__FILE__) . '/local.php'); +global $local_php, $api_tiki; +$api_tiki = 'adodb'; +$local_php = dirname(__FILE__) . '/local.php'; +require_once($local_php); require_once ('lib/adodb/adodb.inc.php'); include_once ('lib/adodb/adodb-pear.inc.php'); @@ -64,6 +67,7 @@ $pwd = getcwd(); chdir(dirname(__FILE__) . '/../..'); +global $smarty; require_once 'lib/init/smarty.php'; $smarty->addPluginsDir('../smarty_tiki/'); require_once 'lib/cache/cachelib.php'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |