------------------------------------------------------------
revno: 1028
committer: Jon Phillips <[email protected]>
branch nick: public
timestamp: Mon 2012-01-16 14:44:02 +0800
message:
Just making sure clear that AUTHORS and last revision fixed, but really
need more checking in the admin interface for latest aiki revision
modified:
configs/config.php
libs/installer.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 'configs/config.php'
--- configs/config.php 2012-01-16 04:17:04 +0000
+++ configs/config.php 2012-01-16 06:44:02 +0000
@@ -30,10 +30,9 @@
define("AIKI_SITE_URL", "@AIKI_SITE_URL@");
}
-
-/** Aiki Framework Revision */
-if (!defined("AIKI_REVISION"))
- define("AIKI_REVISION", "@REVISION@");
+/** @todo review how to replace the rest of these constants, but they
+ aren't breaking anything right now and can be overridden from
+ config.php file. */
/** Aiki Log Directory */
if (!defined("AIKI_LOG_DIR"))
=== modified file 'libs/installer.php'
--- libs/installer.php 2012-01-16 04:17:04 +0000
+++ libs/installer.php 2012-01-16 06:44:02 +0000
@@ -330,8 +330,8 @@
$sql_insert_variable = str_replace("@ADMIN_MAIL@", $email, $sql_insert_variable);
$sql_insert_variable = str_replace("@VERSION@", AIKI_VERSION, $sql_insert_variable);
$sql_insert_variable = str_replace("@REVISION@", Util::get_last_revision(), $sql_insert_variable);
- $sql_insert_variable = str_replace("@AUTHORS@",
- file_get_contents("$AIKI_ROOT_DIR/AUTHORS"), $sql_insert_variable);
+ $sql_insert_variable = str_replace("@AUTHORS@", Util::get_authors(),
+ $sql_insert_variable);
/* In MySQL, the “-- ” (double-dash) comment style requires the second
* dash to be followed by at least one whitespace or control character.
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
