diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2006-01-17 00:23:00 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2006-01-17 00:23:00 +0000 |
| commit | cb6d4d388ad473f124c14be32ed269134c7d2c90 (patch) | |
| tree | 5923b832218f894eba06fc41b1df0f4c8551cb30 /install_packages.php | |
| parent | 194debc2b405cc87db36379973e4eddb19d259f4 (diff) | |
| download | install-cb6d4d388ad473f124c14be32ed269134c7d2c90.tar.gz install-cb6d4d388ad473f124c14be32ed269134c7d2c90.tar.bz2 install-cb6d4d388ad473f124c14be32ed269134c7d2c90.zip | |
merge recent changes into HEAD
Diffstat (limited to 'install_packages.php')
| -rw-r--r-- | install_packages.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/install_packages.php b/install_packages.php index bafaaf1..178a686 100644 --- a/install_packages.php +++ b/install_packages.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_install/install_packages.php,v 1.13 2006/01/10 21:12:27 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_install/install_packages.php,v 1.14 2006/01/17 00:23:00 squareing Exp $ * @package install * @subpackage functions */ @@ -126,7 +126,7 @@ if( isset( $_REQUEST['fSubmitDbCreate'] ) ) { if( in_array( $package, $_REQUEST['PACKAGE'] ) || !empty( $gBitInstaller->mPackages[$package]['required'] ) ) { $gBitInstaller->storePreference( 'package_'.strtolower( $package ), 'y', $package ); // we'll default wiki to the home page - if( $package == 'wiki' ) { + if( $package == WIKI_PKG_NAME ) { $gBitSystem->storePreference( "bitIndex", WIKI_PKG_NAME ); } } @@ -145,6 +145,7 @@ if( isset( $_REQUEST['fSubmitDbCreate'] ) ) { $package_list[] = $package; if( !empty( $gBitInstaller->mPackages[$package]['defaults'] ) ) { foreach( $gBitInstaller->mPackages[$package]['defaults'] as $def ) { + if ($gBitInstaller->mDb->mType == 'firebird' ) $def = preg_replace("/\\\'/","''", $def ); $gBitInstaller->mDb->query( $def ); } } |