From 92031bff667cd3b5d3e39f7fe36729001818b854 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 19 Dec 2012 21:06:15 +0000 Subject: [PATCH] This is correct (sorry) --- inc/xml-functions.php | 2 +- install/tables.sql | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inc/xml-functions.php b/inc/xml-functions.php index e180a49fe9..d31c992014 100644 --- a/inc/xml-functions.php +++ b/inc/xml-functions.php @@ -238,7 +238,7 @@ function xmlCharacterHandler ($resource, $characters) { } // END - if // @TODO Handle characters - die(__FUNCTION__ . ':characters[]='.strlen($characters)); + die(__FUNCTION__ . ':characters[' . gettype($characters) . ']=' . strlen($characters)); } // Checks if given type is valid, makes all lower-case diff --git a/install/tables.sql b/install/tables.sql index 6bb6c27f2b..006783b45d 100644 --- a/install/tables.sql +++ b/install/tables.sql @@ -67,11 +67,11 @@ CREATE TABLE `{?_MYSQL_PREFIX?}_config` ( DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_extensions`; CREATE TABLE `{?_MYSQL_PREFIX?}_extensions` ( - `ext_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, + `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, `ext_name` VARCHAR(255) NOT NULL DEFAULT '', `ext_active` ENUM('Y','N') NOT NULL DEFAULT 'N', `ext_version` VARCHAR(255) NOT NULL DEFAULT 'INVALID', - PRIMARY KEY (`ext_id`) + PRIMARY KEY (`id`) ) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT 'Extension registry'; DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_guest_menu`; -- 2.39.2