mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

fix upgraders generating content of js files

Browse Source 
References #80
This commit is contained in:
Ian 2014-03-08 09:38:59 +01:00
parent 1e1305c24c
commit 179f6a19d6
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/admin/upgrader.inc.php
View File

@ -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();

4
serendipity_config.inc.php
View File

@ -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'));
}

2
templates/2k11/admin/upgrader.inc.tpl
View File

@ -8,7 +8,7 @@
<link rel="stylesheet" href="{$head_link_stylesheet}">
<script src="{serendipity_getFile file='admin/js/modernizr-2.6.2.min.js'}"></script>
{if $admin_vars.admin_installed}{serendipity_hookPlugin hook="backend_header" hookAll="true"}{/if}
<script src="{$head_link_script}"></script>
<script src="{$serendipityHTTPPath}{$templatePath}jquery.js"></script>
</head>
<body id="serendipity_admin_page">
{if NOT $admin_vars.no_banner}