From e93703d1700b02ca75d1826c22be985749d1e52b Mon Sep 17 00:00:00 2001 From: Jared Hancock <jared@osticket.com> Date: Tue, 20 Aug 2013 15:42:59 +0000 Subject: [PATCH] Fix oops with dynamic data and 1.7.0 merge --- bootstrap.php | 2 +- include/upgrader/streams/core.sig | 2 +- ...6fcef4a-43fbf5b9.patch.sql => 16fcef4a-d51f303a.patch.sql} | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename include/upgrader/streams/core/{16fcef4a-43fbf5b9.patch.sql => 16fcef4a-d51f303a.patch.sql} (87%) diff --git a/bootstrap.php b/bootstrap.php index 9f7e49e9e..cedc9436f 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -202,7 +202,7 @@ require(INCLUDE_DIR.'class.ostsession.php'); require(INCLUDE_DIR.'class.usersession.php'); require(INCLUDE_DIR.'class.pagenate.php'); //Pagenate helper! require(INCLUDE_DIR.'class.log.php'); -require(INCLUDE_DIR.'class.mcrypt.php'); +require(INCLUDE_DIR.'class.crypto.php'); require(INCLUDE_DIR.'class.misc.php'); require(INCLUDE_DIR.'class.timezone.php'); require(INCLUDE_DIR.'class.http.php'); diff --git a/include/upgrader/streams/core.sig b/include/upgrader/streams/core.sig index 3ab6cfb80..e6b76f0e8 100644 --- a/include/upgrader/streams/core.sig +++ b/include/upgrader/streams/core.sig @@ -1 +1 @@ -43fbf5b9254787c93d049be0b607cf2d +d51f303a2c9ee04f9906fc1b6047459f diff --git a/include/upgrader/streams/core/16fcef4a-43fbf5b9.patch.sql b/include/upgrader/streams/core/16fcef4a-d51f303a.patch.sql similarity index 87% rename from include/upgrader/streams/core/16fcef4a-43fbf5b9.patch.sql rename to include/upgrader/streams/core/16fcef4a-d51f303a.patch.sql index cb660f749..34581a033 100644 --- a/include/upgrader/streams/core/16fcef4a-43fbf5b9.patch.sql +++ b/include/upgrader/streams/core/16fcef4a-d51f303a.patch.sql @@ -1,6 +1,6 @@ /** * @version v1.8.0 - * @signature 43fbf5b9254787c93d049be0b607cf2d + * @signature d51f303a2c9ee04f9906fc1b6047459f * * Make default data translatable. This patch also adds columns to database * tables to introduce the concept of a language. @@ -21,5 +21,5 @@ ALTER TABLE `%TABLE_PREFIX%page` -- Finished with patch UPDATE `%TABLE_PREFIX%config` - SET `value` = '43fbf5b9254787c93d049be0b607cf2d' + SET `value` = 'd51f303a2c9ee04f9906fc1b6047459f' WHERE `key` = 'schema_signature' AND `namespace` = 'core'; -- GitLab