From: <lph...@us...> - 2009-10-26 17:39:54
|
Revision: 22654 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=22654&view=rev Author: lphuberdeau Date: 2009-10-26 17:39:45 +0000 (Mon, 26 Oct 2009) Log Message: ----------- [MOD] Make sure replication is ignored in the installer phases (use master no matter what) Modified Paths: -------------- trunk/installer/shell.php trunk/installer/tiki-installer.php trunk/tiki-install.php Modified: trunk/installer/shell.php =================================================================== --- trunk/installer/shell.php 2009-10-26 17:32:22 UTC (rev 22653) +++ trunk/installer/shell.php 2009-10-26 17:39:45 UTC (rev 22654) @@ -15,6 +15,9 @@ require_once('installer/installlib.php'); include $local_php; +// In case of replication, ignore it during installer. +unset( $shadow_dbs, $shadow_user, $shadow_pass, $shadow_host ); + class IgnoreErrorHandler { function handle( TikiDb $db, $query, $values, $result ) { } Modified: trunk/installer/tiki-installer.php =================================================================== --- trunk/installer/tiki-installer.php 2009-10-26 17:32:22 UTC (rev 22653) +++ trunk/installer/tiki-installer.php 2009-10-26 17:39:45 UTC (rev 22654) @@ -451,6 +451,7 @@ } else { $local = 'db/local.php'; } + $tikidomain = $multi; include 'lib/cache/cachelib.php'; $cachelib->empty_full_cache(); @@ -535,6 +536,8 @@ } else { // include the file to get the variables include $local; + // In case of replication, ignore it during installer. + unset( $shadow_dbs, $shadow_user, $shadow_pass, $shadow_host ); if ($dbversion_tiki == '1.10') { $dbversion_tiki = '2.0'; } @@ -620,6 +623,8 @@ $smarty->assign('dbcon', 'y'); write_local_php($_REQUEST['db'], $_REQUEST['host'], $_REQUEST['user'], $_REQUEST['pass'], $_REQUEST['name']); include $local; + // In case of replication, ignore it during installer. + unset( $shadow_dbs, $shadow_user, $shadow_pass, $shadow_host ); $installer = new Installer; $installer->setServerType($db_tiki); } Modified: trunk/tiki-install.php =================================================================== --- trunk/tiki-install.php 2009-10-26 17:32:22 UTC (rev 22653) +++ trunk/tiki-install.php 2009-10-26 17:39:45 UTC (rev 22654) @@ -51,6 +51,10 @@ // Were database details defined before? If so, load them if (file_exists('db/local.php')) { include 'db/local.php'; + + // In case of replication, ignore it during installer. + unset( $shadow_dbs, $shadow_user, $shadow_pass, $shadow_host ); + include_once 'lib/adodb/adodb.inc.php'; $dbTiki = ADONewConnection($db_tiki); $db = new TikiDb_Adodb($dbTiki); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |