------------------------------------------------------------
revno: 1056
committer: Roger Martin <rg1...@gmail.com>
branch nick: aikiframework
timestamp: Mon 2012-01-30 00:03:22 +0100
message:
apps/installer is called when no config file is found
modified:
bootstrap.php
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'bootstrap.php'
--- bootstrap.php 2012-01-26 19:28:38 +0000
+++ bootstrap.php 2012-01-29 23:03:22 +0000
@@ -66,14 +66,7 @@
/**
* Set the configuration option defaults.
*
- * @see configs/config.php
- * @TODO The assumption here is that config.php overrides all defaults! Is that
- * correct?
*/
-if (!file_exists("$AIKI_ROOT_DIR/config.php")) {
- /** @see config.php */
- require_once("$AIKI_ROOT_DIR/configs/config.php");
-}
/* use run-time installer config */
@@ -82,9 +75,8 @@
require_once("$AIKI_ROOT_DIR/config.php");
}
else {
- /** @see installer.php */
- require("$AIKI_ROOT_DIR/libs/installer.php");
- die();
+ /** @see assets/apps/installer/installer.php */
+ header("location:./assets/apps/installer/installer.php");
}
/* setting $config["log_level"] = "NONE" disables the log
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : aikiframework-devel@lists.launchpad.net
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
