adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-20 00:23:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

combined script now really merges files

Browse Source 
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
This commit is contained in:
rvelices
2010-12-06 20:52:44 +00:00
parent 1e6cae89c3
commit 1cbbe10bfd
5 changed files with 116 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/admin_multi_view/is_admin.inc.php
+3 -1
View File
@@ -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;' ) );
}