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

Fix installer, smartification broke it

Browse Source 
Sorry Falk
This commit is contained in:
onli
2013-06-27 21:01:16 +02:00
parent adcb2f3e87
commit 8a188747ae
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions_installer.inc.php
View File

@@ -625,9 +625,9 @@ function serendipity_checkInstallation() {
$serendipity['dbType'] = $_POST['dbType'];
// Probe database
// (do it after the dir stuff, as we need to be able to create the sqlite database)
@include_once($_POST['serendipityPath'] . 'include/db/db.inc.php');
include_once(S9Y_INCLUDE_PATH . "include/db/{$serendipity['dbType']}.inc.php");
// For shared installations, probe the file on include path
include_once(S9Y_INCLUDE_PATH . 'include/db/db.inc.php');
//include_once(S9Y_INCLUDE_PATH . 'include/db/db.inc.php');
if (S9Y_DB_INCLUDED) {
serendipity_db_probe($_POST, $errs);

4
serendipity_admin.php
View File

@@ -11,9 +11,7 @@ include('serendipity_config.inc.php');
header('Content-Type: text/html; charset=' . LANG_CHARSET);
if (IS_installed === false) {
require(S9Y_INCLUDE_PATH . 'include/functions_permalinks.inc.php');
require(S9Y_INCLUDE_PATH . 'include/functions_installer.inc.php');
require(S9Y_INCLUDE_PATH . 'include/functions_config.inc.php');
require_once(S9Y_INCLUDE_PATH . 'include/functions.inc.php');
} else {
if (defined('IS_up2date') && IS_up2date === true) {
serendipity_plugin_api::hook_event('backend_configure', $serendipity);

3
templates/2k11/admin/installer.inc.tpl
View File

@@ -5,9 +5,8 @@
<meta charset="{$CONST.LANG_CHARSET}">
<title>{$CONST.SERENDIPITY_ADMIN_SUITE}</title>
<meta name="viewport" content="width=device-width">
<link rel="stylesheet" href="{$head_link_stylesheet}">
<link rel="stylesheet" href="{serendipity_getFile file='admin/style.css'}">
<script src="{serendipity_getFile file='admin/js/modernizr-2.6.2.min.js'}"></script>
{serendipity_hookPlugin hook="backend_header" hookAll="true"}
</head>
<body id="serendipity_admin_page">
<header id="top">

1
templates/2k11/admin/style.css
View File

@@ -1711,7 +1711,6 @@ form > .button_link:first-of-type {
.no-js .template_show_info,
.no-js .comment_summary,
.no-js .editor_toolbar,
.js .additional_info,
.hidden {
display: none !important;
visibility: hidden;