Merge branch 'develop' into feature.diff-whitespace

This commit is contained in:
Thomas Keller 2011-10-09 01:40:59 +02:00
commit 473e9153ed

View File

@ -21,7 +21,7 @@ if (file_exists($testconfig['db_database'])) {
} }
echo ">>> creating empty test database...\n"; echo ">>> creating empty test database...\n";
passthru('php ' . PLUF_PATH . '/migrate.php --conf=' . TESTDIR . '/config.php -a -i'); passthru('php ' . escapeshellarg(PLUF_PATH.'/migrate.php') . ' --conf=' . escapeshellarg(TESTDIR.'/config.php').' -a -i');
echo ">>> setting up web application...\n"; echo ">>> setting up web application...\n";
require 'Pluf.php'; require 'Pluf.php';