template was loaded in the wrong place

This commit is contained in:
Zach Prezkuta 2012-08-18 13:28:49 -06:00
parent 22bf48cae9
commit d00c98b8b8
2 changed files with 3 additions and 3 deletions

View file

@ -606,7 +606,7 @@ CREATE TABLE IF NOT EXISTS `item_id` (
-- Table structure for table `locks` -- Table structure for table `locks`
-- --
CREATE TABLE `locks` ( CREATE TABLE IF NOT EXISTS `locks` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`name` char(128) NOT NULL, `name` char(128) NOT NULL,
`locked` tinyint(1) NOT NULL DEFAULT '0', `locked` tinyint(1) NOT NULL DEFAULT '0',

View file

@ -60,7 +60,7 @@ function install_post(&$a) {
return; return;
break; break;
case 4; case 4:
$urlpath = $a->get_path(); $urlpath = $a->get_path();
$dbhost = notags(trim($_POST['dbhost'])); $dbhost = notags(trim($_POST['dbhost']));
$dbuser = notags(trim($_POST['dbuser'])); $dbuser = notags(trim($_POST['dbuser']));
@ -155,11 +155,11 @@ function install_content(&$a) {
} }
if(x($a->data,'txt') && strlen($a->data['txt'])) { if(x($a->data,'txt') && strlen($a->data['txt'])) {
$tpl = get_markup_template('install.tpl');
$db_return_text .= manual_config($a); $db_return_text .= manual_config($a);
} }
if ($db_return_text!="") { if ($db_return_text!="") {
$tpl = get_markup_template('install.tpl');
return replace_macros($tpl, array( return replace_macros($tpl, array(
'$title' => $install_title, '$title' => $install_title,
'$pass' => "", '$pass' => "",