------------------------------------------------------------
revno: 1086
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Sun 2012-02-12 00:09:09 +0100
message:
minor corrections
modified:
libs/site.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 'libs/site.php'
--- libs/site.php 2012-01-05 17:17:40 +0000
+++ libs/site.php 2012-02-11 23:09:09 +0000
@@ -68,7 +68,7 @@
/**
* return the default language of a site.
- * @return array languages
+ * @return string language
*/
function language($new=NULL) {
global $aiki;
@@ -163,10 +163,7 @@
// try read site information and test if is_active.
$info = $db->get_row("SELECT * from aiki_sites where site_shortcut='{$config['site']}' limit 1");
if (is_null($info)) {
- die($aiki->message->error("Fatal Error: Wrong site name provided. " .
- (defined('ENABLE_RUNTIME_INSTALLER') && ENABLE_RUNTIME_INSTALLER == FALSE ?
- "ENABLE_RUNTIME_INSTALLER is set to FALSE." : ""),
- NULL, false));
+ die($aiki->message->error("Fatal Error: Wrong site name provided. " ,NULL,false));
} elseif ( $info->is_active != 1 ) {
die($aiki->message->error($info->if_closed_output ? $info->if_closed_output : "Site {$config['site']} is closed.",
NULL,
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
