]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Merge pull request #156 from cash/cache_lang
authorcash <cash.costello@gmail.com>
Sat, 4 Feb 2012 18:05:31 +0000 (13:05 -0500)
committercash <cash.costello@gmail.com>
Sat, 4 Feb 2012 18:05:31 +0000 (13:05 -0500)
Fixes #2877 Adds language string caching to system cache

1  2 
engine/lib/cache.php
engine/lib/configuration.php

index d4cd6b460fd184f7ce3b50129e6a0a735ca276d7,b329c58ec7870f54bcbffe80fcc15fa178a0e2ff..c117b9ec9cc18a800c53204f49ed87269dc09e0d
@@@ -443,9 -440,21 +437,15 @@@ function _elgg_cache_init() 
  
        // cache system data if enabled and not loaded
        if ($CONFIG->system_cache_enabled && !$CONFIG->system_cache_loaded) {
 -              $cache_types = array(
 -                      'view_paths' => 'views',
 -                      'view_types' => 'view_types',
 -              );
 -              $data = array();
 -              foreach ($cache_types as $type => $var_name) {
 -                      elgg_save_system_cache($type, serialize($CONFIG->$var_name));
 -              }
 +              elgg_save_system_cache('view_locations', serialize($CONFIG->views->locations));
 +              elgg_save_system_cache('view_types', serialize($CONFIG->view_types));
        }
+       if ($CONFIG->system_cache_enabled && !$CONFIG->i18n_loaded_from_cache) {
+               foreach ($CONFIG->translations as $lang => $map) {
+                       elgg_save_system_cache("$lang.php", serialize($map));
+               }
+       }
  }
  
  elgg_register_event_handler('ready', 'system', '_elgg_cache_init');
Simple merge