diff options
| author | rvelices <rv-github@modusoptimus.com> | 2010-12-06 20:52:44 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2010-12-06 20:52:44 +0000 |
| commit | 1cbbe10bfd88f12f62b9cfc15e2ccd46d5e37b27 (patch) | |
| tree | 0c376ec8354a7abb710c0f111fbcc42e6f6e137d /plugins/admin_multi_view/is_admin.inc.php | |
| parent | 1e6cae89c30296045b21c39502c1a20a9538dad7 (diff) | |
combined script now really merges files
added option $conf['template_combine_files'] by default true to enable/disable file combining
git-svn-id: http://piwigo.org/svn/trunk@8012 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | plugins/admin_multi_view/is_admin.inc.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/admin_multi_view/is_admin.inc.php b/plugins/admin_multi_view/is_admin.inc.php index fbadada3a..df9e91276 100644 --- a/plugins/admin_multi_view/is_admin.inc.php +++ b/plugins/admin_multi_view/is_admin.inc.php @@ -25,7 +25,9 @@ if (! defined('MULTIVIEW_CONTROLLER') ) $conf['debug_l10n'] = true; if (pwg_get_session_var( 'multiview_debug_template', 0 )) $conf['debug_template'] = true; - if (pwg_get_session_var( 'multiview_no_history', 0 )) + if (!pwg_get_session_var( 'multiview_template_combine_files', 1 )) + $conf['template_combine_files'] = false; + if (pwg_get_session_var( 'multiview_no_history', 0 )) { add_event_handler( 'pwg_log_allowed', create_function( '', 'return false;' ) ); } |