From 179f6a19d6de0dcf4b7e1319fa8a1a06d54b2624 Mon Sep 17 00:00:00 2001 From: Ian Date: Sat, 8 Mar 2014 09:38:59 +0100 Subject: [PATCH] fix upgraders generating content of js files References #80 --- include/admin/upgrader.inc.php | 1 + serendipity_config.inc.php | 4 +++- templates/2k11/admin/upgrader.inc.tpl | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/admin/upgrader.inc.php b/include/admin/upgrader.inc.php index c1f5aa6d..e12009f3 100644 --- a/include/admin/upgrader.inc.php +++ b/include/admin/upgrader.inc.php @@ -404,6 +404,7 @@ if (($showAbort && $serendipity['GET']['action'] == 'ignore') || $serendipity['G } $data['get']['action'] = $serendipity['GET']['action']; // don't trust {$smarty.get.vars} if not proofed, as we often change GET vars via serendipty['GET'] by runtime +$data['templatePath'] = $serendipity['templatePath']; if (!is_object($serendipity['smarty'])) { serendipity_smarty_init(); diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php index 6622c002..e9500c48 100644 --- a/serendipity_config.inc.php +++ b/serendipity_config.inc.php @@ -404,7 +404,9 @@ if (IS_up2date === false && !defined('IN_upgrader')) { $css_mode = 'serendipity_admin.css'; return 1; } - + if ( preg_match('@/(serendipity_editor\.js|serendipity\.js)@', $_SERVER['REQUEST_URI'], $matches)) { + return 1; + } serendipity_die(sprintf(SERENDIPITY_NEEDS_UPGRADE, $serendipity['versionInstalled'], $serendipity['version'], $serendipity['serendipityHTTPPath'] . 'serendipity_admin.php')); } diff --git a/templates/2k11/admin/upgrader.inc.tpl b/templates/2k11/admin/upgrader.inc.tpl index 392819de..f636017f 100644 --- a/templates/2k11/admin/upgrader.inc.tpl +++ b/templates/2k11/admin/upgrader.inc.tpl @@ -8,7 +8,7 @@ {if $admin_vars.admin_installed}{serendipity_hookPlugin hook="backend_header" hookAll="true"}{/if} - + {if NOT $admin_vars.no_banner}