From c5978c4547a654684cafae09e72cc2c04a02c74b Mon Sep 17 00:00:00 2001 From: "Logical Arts, LLC" Date: Mon, 21 Dec 2015 09:55:41 -0800 Subject: [PATCH] Add missing x-zip to installer, remove invalid default date values in schema --- install/odm.php | 5 +++-- install/upgrade_1257.php | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/install/odm.php b/install/odm.php index ad8ef8d5..aa21601d 100644 --- a/install/odm.php +++ b/install/odm.php @@ -104,7 +104,7 @@ category int(11) unsigned NOT NULL default '0', owner int(11) unsigned default NULL, realname varchar(255) NOT NULL default '', - created datetime NOT NULL default '0000-00-00 00:00:00', + created datetime NOT NULL, description varchar(255) default NULL, comment varchar(255) default '', status smallint(6) default NULL, @@ -180,7 +180,7 @@ $query = "CREATE TABLE {$dbprefix}log ( id int(11) unsigned NOT NULL default '0', - modified_on datetime NOT NULL default '0000-00-00 00:00:00', + modified_on datetime NOT NULL, modified_by varchar(25) default NULL, note text, revision varchar(255) default NULL, @@ -377,6 +377,7 @@ "INSERT INTO `{$dbprefix}filetypes` VALUES(NULL, 'application/mspowerpoint', 1);", "INSERT INTO `{$dbprefix}filetypes` VALUES(NULL, 'application/octet-stream', 1);", "INSERT INTO `{$dbprefix}filetypes` VALUES(NULL, 'application/x-zip-compressed', 1);", +"INSERT INTO `{$dbprefix}filetypes` VALUES(NULL, 'application/x-zip', 1);", "INSERT INTO `{$dbprefix}filetypes` VALUES(NULL, 'application/zip', 1);", "INSERT INTO `{$dbprefix}filetypes` VALUES(NULL, 'image/tiff', 1);", "INSERT INTO `{$dbprefix}filetypes` VALUES(NUll, 'image/tif', 1);", diff --git a/install/upgrade_1257.php b/install/upgrade_1257.php index 01d04706..151bee11 100644 --- a/install/upgrade_1257.php +++ b/install/upgrade_1257.php @@ -89,6 +89,8 @@ "INSERT INTO `{$_SESSION['db_prefix']}filetypes` VALUES(NULL, 'text/richtxt', 1);", "INSERT INTO `{$_SESSION['db_prefix']}filetypes` VALUES(NULL, 'application/mspowerpoint', 1);", "INSERT INTO `{$_SESSION['db_prefix']}filetypes` VALUES(NULL, 'application/octet-stream', 1);", +"INSERT INTO `{$_SESSION['db_prefix']}filetypes` VALUES(NULL, 'application/zip', 1);", +"INSERT INTO `{$_SESSION['db_prefix']}filetypes` VALUES(NULL, 'application/x-zip', 1);", "INSERT INTO `{$_SESSION['db_prefix']}filetypes` VALUES(NULL, 'application/x-zip-compressed', 1);", "INSERT INTO `{$_SESSION['db_prefix']}filetypes` VALUES(NULL, 'image/tiff', 1);", "INSERT INTO `{$_SESSION['db_prefix']}filetypes` VALUES(NUll, 'image/tif', 1);",