diff options
| author | Cash Costello <cash.costello@gmail.com> | 2012-01-24 17:59:12 -0800 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2012-01-24 17:59:12 -0800 |
| commit | 618263935a0b01bcef7a94153a41be1a6170154a (patch) | |
| tree | 99c04314de2b669e8aef22c61ffa24f9aa6b14c5 /mod | |
| parent | 54bef9fc0b85acaf6950e618bd02aa50befd2acc (diff) | |
| parent | 7c962fa6cbaf687daafb8588ff601fe664e1392c (diff) | |
| download | elgg-618263935a0b01bcef7a94153a41be1a6170154a.tar.gz elgg-618263935a0b01bcef7a94153a41be1a6170154a.tar.bz2 | |
Merge pull request #151 from cash/system_cache
Turn viewpath cache into a system cache
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/developers/actions/developers/settings.php | 6 | ||||
| -rw-r--r-- | mod/developers/languages/en.php | 6 | ||||
| -rw-r--r-- | mod/developers/views/default/admin/developers/settings.php | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/mod/developers/actions/developers/settings.php b/mod/developers/actions/developers/settings.php index 811fd22c0..7c91e2f5f 100644 --- a/mod/developers/actions/developers/settings.php +++ b/mod/developers/actions/developers/settings.php @@ -11,10 +11,10 @@ if (get_input('simple_cache')) { elgg_disable_simplecache(); } -if (get_input('view_path_cache')) { - elgg_enable_filepath_cache(); +if (get_input('system_cache')) { + elgg_enable_system_cache(); } else { - elgg_disable_filepath_cache(); + elgg_disable_system_cache(); } $debug = get_input('debug_level'); diff --git a/mod/developers/languages/en.php b/mod/developers/languages/en.php index 812f779fa..262759e23 100644 --- a/mod/developers/languages/en.php +++ b/mod/developers/languages/en.php @@ -16,9 +16,9 @@ $english = array( // settings 'elgg_dev_tools:settings:explanation' => 'Control your development and debugging settings below. Some of these settings are also available on other admin pages.', 'developers:label:simple_cache' => 'Use simple cache', - 'developers:help:simple_cache' => 'Turn off the file cache when developing. Otherwise, changes to your views (including css) will be ignored.', - 'developers:label:view_path_cache' => 'Use view path cache', - 'developers:help:view_path_cache' => 'Turn this off when developing. Otherwise, new views in your plugins will not be registered.', + 'developers:help:simple_cache' => 'Turn off this cache when developing. Otherwise, changes to your CSS and JavaScript will be ignored.', + 'developers:label:system_cache' => 'Use system cache', + 'developers:help:system_cache' => 'Turn this off when developing. Otherwise, changes in your plugins will not be registered.', 'developers:label:debug_level' => "Trace level", 'developers:help:debug_level' => "This controls the amount of information logged. See elgg_log() for more information.", 'developers:label:display_errors' => 'Display fatal PHP errors', diff --git a/mod/developers/views/default/admin/developers/settings.php b/mod/developers/views/default/admin/developers/settings.php index dcc0a3e4f..459cbabad 100644 --- a/mod/developers/views/default/admin/developers/settings.php +++ b/mod/developers/views/default/admin/developers/settings.php @@ -10,10 +10,10 @@ $data = array( 'checked' => elgg_get_config('simplecache_enabled') == 1, ), - 'view_path_cache' => array( + 'system_cache' => array( 'type' => 'checkbox', 'value' => 1, - 'checked' => elgg_get_config('viewpath_cache_enabled') == 1, + 'checked' => elgg_get_config('system_cache_enabled') == 1, ), 'display_errors' => array( |