php/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

exclude installerHTTPPath from serendipity_getFile

Browse Source 
References #80
This commit is contained in:
Ian
2014-03-09 13:19:38 +01:00
parent 0a2e6964ca
commit 9b56a35f26
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/admin/installer.inc.php
+1 -6
View File
@@ -30,7 +30,7 @@ $data['basedir'] = $basedir;
$data['phpversion'] = phpversion(); $data['phpversion'] = phpversion();
$data['versionInstalled'] = $serendipity['versionInstalled']; $data['versionInstalled'] = $serendipity['versionInstalled'];
$data['templatePath'] = $serendipity['templatePath']; $data['templatePath'] = $serendipity['templatePath'];
$data['installerHTTPPath'] = str_replace('//', '/', dirname($_SERVER['PHP_SELF']) . '/'); $data['installerHTTPPath'] = str_replace('//', '/', dirname($_SERVER['PHP_SELF']) . '/'); // since different OS handlers for enddir
/** /**
* Checks a return code constant if it's successfull or an error and return HTML code * Checks a return code constant if it's successfull or an error and return HTML code
@@ -373,17 +373,12 @@ if ( (int)$serendipity['GET']['step'] == 0 ) {
return; return;
} }
include_once dirname(dirname(__FILE__)) . "/functions.inc.php"; include_once dirname(dirname(__FILE__)) . "/functions.inc.php";
if (!is_object($serendipity['smarty'])) { if (!is_object($serendipity['smarty'])) {
serendipity_smarty_init(); serendipity_smarty_init();
} }
$serendipity['smarty']->assign($data); $serendipity['smarty']->assign($data);
$tfile = serendipity_getTemplateFile("admin/installer.inc.tpl"); $tfile = serendipity_getTemplateFile("admin/installer.inc.tpl");
templates/2k11/admin/installer.inc.tpl
+1 -1
View File
@@ -5,7 +5,7 @@
<meta charset="{$CONST.LANG_CHARSET}"> <meta charset="{$CONST.LANG_CHARSET}">
<title>{$CONST.SERENDIPITY_ADMIN_SUITE}</title> <title>{$CONST.SERENDIPITY_ADMIN_SUITE}</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="{$installerHTTPPath}{serendipity_getFile file='admin/style.css'}"> <link rel="stylesheet" href="{serendipity_getFile file='admin/style.css'}">
<script src="{$installerHTTPPath}{$templatePath}jquery.js"></script> <script src="{$installerHTTPPath}{$templatePath}jquery.js"></script>
</head> </head>
<body id="serendipity_admin_page"> <body id="serendipity_admin_page">