diff options
| author | cash <cash.costello@gmail.com> | 2012-02-04 13:05:31 -0500 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2012-02-04 13:05:31 -0500 |
| commit | 601ec5ccf5eb6940ca468b31e1b400412697c8cb (patch) | |
| tree | 639b9d1d3591d61c86808a60fe354bce811ce52e /engine/lib/elgglib.php | |
| parent | 76d089fe3662a7051258d6d1843a1167ea8017b1 (diff) | |
| parent | 06ba6ccfb8bb5a8da8464d8f86454b468744c9cc (diff) | |
| download | elgg-601ec5ccf5eb6940ca468b31e1b400412697c8cb.tar.gz elgg-601ec5ccf5eb6940ca468b31e1b400412697c8cb.tar.bz2 | |
Merge pull request #156 from cash/cache_lang
Fixes #2877 Adds language string caching to system cache
Diffstat (limited to 'engine/lib/elgglib.php')
| -rw-r--r-- | engine/lib/elgglib.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index aba84bd48..11bdc7285 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -2062,7 +2062,8 @@ function elgg_walled_garden() { * 2. connects to database * 3. verifies the installation suceeded * 4. loads application configuration - * 5. loads site configuration + * 5. loads i18n data + * 6. loads site configuration * * @access private */ @@ -2071,14 +2072,14 @@ function _elgg_engine_boot() { set_error_handler('_elgg_php_error_handler'); set_exception_handler('_elgg_php_exception_handler'); - register_translations(dirname(dirname(dirname(__FILE__))) . "/languages/"); - setup_db_connections(); verify_installation(); _elgg_load_application_config(); + register_translations(dirname(dirname(dirname(__FILE__))) . "/languages/"); + _elgg_load_site_config(); _elgg_load_cache(); |