diff options
| author | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-06-04 16:53:40 +0000 |
|---|---|---|
| committer | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-06-04 16:53:40 +0000 |
| commit | efda1efd37d66dcc4a074a90678c2b113b391278 (patch) | |
| tree | 3e8dee34e05607da06dce2b0e363ca92d5df12b7 | |
| parent | 8f85395784c896896e68d41b74222d7b4c806ab3 (diff) | |
| download | elgg-efda1efd37d66dcc4a074a90678c2b113b391278.tar.gz elgg-efda1efd37d66dcc4a074a90678c2b113b391278.tar.bz2 | |
Fixed the installation labels issue!
git-svn-id: https://code.elgg.org/elgg/trunk@798 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | engine/lib/configuration.php | 2 | ||||
| -rw-r--r-- | engine/lib/elgglib.php | 11 | ||||
| -rw-r--r-- | engine/lib/languages.php | 5 | ||||
| -rw-r--r-- | engine/lib/sessions.php | 2 | ||||
| -rw-r--r-- | engine/lib/sites.php | 3 |
5 files changed, 15 insertions, 8 deletions
diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php index 47a0d5428..bc243eb33 100644 --- a/engine/lib/configuration.php +++ b/engine/lib/configuration.php @@ -116,6 +116,8 @@ global $CONFIG;
+ if (!is_installed() || !is_db_installed()) return false;
+
$path = datalist_get('path');
if (!empty($path))
$CONFIG->path = $path;
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index ba122b2ec..c01d81649 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -663,32 +663,33 @@ return false;
}
- } else {
+ } else {
+
if (!empty($CONFIG->events[$event][$object_type]) && is_array($CONFIG->events[$event][$object_type])) {
foreach($CONFIG->events[$event][$object_type] as $eventfunction) {
if ($eventfunction($event, $object_type, $object) === false) {
- return false;
+ // return false;
}
}
}
if (!empty($CONFIG->events['all'][$object_type]) && is_array($CONFIG->events['all'][$object_type])) {
foreach($CONFIG->events['all'][$object_type] as $eventfunction) {
if ($eventfunction($event, $object_type, $object) === false) {
- return false;
+ // return false;
}
}
}
if (!empty($CONFIG->events[$event]['all']) && is_array($CONFIG->events[$event]['all'])) {
foreach($CONFIG->events[$event]['all'] as $eventfunction) {
if ($eventfunction($event, $object_type, $object) === false) {
- return false;
+ // return false;
}
}
}
if (!empty($CONFIG->events['all']['all']) && is_array($CONFIG->events['all']['all'])) {
foreach($CONFIG->events['all']['all'] as $eventfunction) {
if ($eventfunction($event, $object_type, $object) === false) {
- return false;
+ // return false;
}
}
}
diff --git a/engine/lib/languages.php b/engine/lib/languages.php index a81cd13b3..696d3eff4 100644 --- a/engine/lib/languages.php +++ b/engine/lib/languages.php @@ -78,8 +78,7 @@ * @param unknown_type $object_type
* @param unknown_type $object
*/
- function load_translations($event, $object_type, $object) {
-
+ function init_translations() {
global $CONFIG;
register_translations($CONFIG->path . "languages/");
@@ -100,6 +99,6 @@ }
}
- register_event_handler("boot","system","load_translations");
+ register_event_handler("boot","system","init_translations",5);
?>
\ No newline at end of file diff --git a/engine/lib/sessions.php b/engine/lib/sessions.php index 2995c1723..7a5edec2c 100644 --- a/engine/lib/sessions.php +++ b/engine/lib/sessions.php @@ -175,6 +175,8 @@ register_action("login",true);
register_action("logout");
+
+ return true;
}
diff --git a/engine/lib/sites.php b/engine/lib/sites.php index 1c75fdff6..0db40e5d4 100644 --- a/engine/lib/sites.php +++ b/engine/lib/sites.php @@ -483,6 +483,9 @@ function sites_init($event, $object_type, $object) {
global $CONFIG;
+
+ if (!is_installed() || !is_db_installed()) return false;
+
$site = trigger_plugin_hook("siteid","system");
if ($site === null || $site === false) {
$CONFIG->site_id = (int) datalist_get('default_site');
|