From bf97c70c66bda29a99b1acc11449e20ebb9d3222 Mon Sep 17 00:00:00 2001 From: Michael Babker Date: Mon, 29 Sep 2014 20:57:28 -0400 Subject: [PATCH] Reset for development --- .../components/com_admin/sql/updates/mysql/2.5.27.sql | 1 + .../components/com_admin/sql/updates/sqlazure/2.5.27.sql | 1 + administrator/includes/framework.php | 2 +- administrator/manifests/files/joomla.xml | 2 +- includes/framework.php | 2 +- libraries/cms/version/version.php | 4 ++-- 6 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 administrator/components/com_admin/sql/updates/mysql/2.5.27.sql create mode 100644 administrator/components/com_admin/sql/updates/sqlazure/2.5.27.sql diff --git a/administrator/components/com_admin/sql/updates/mysql/2.5.27.sql b/administrator/components/com_admin/sql/updates/mysql/2.5.27.sql new file mode 100644 index 0000000000000..6c06f203deff8 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/2.5.27.sql @@ -0,0 +1 @@ +# Placeholder file for database changes for version 2.5.27 diff --git a/administrator/components/com_admin/sql/updates/sqlazure/2.5.27.sql b/administrator/components/com_admin/sql/updates/sqlazure/2.5.27.sql new file mode 100644 index 0000000000000..6c06f203deff8 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/sqlazure/2.5.27.sql @@ -0,0 +1 @@ +# Placeholder file for database changes for version 2.5.27 diff --git a/administrator/includes/framework.php b/administrator/includes/framework.php index 7c6610b5ecd9c..0dae993d0fc65 100644 --- a/administrator/includes/framework.php +++ b/administrator/includes/framework.php @@ -19,7 +19,7 @@ /* * Installation check, and check on removal of the install directory. */ -if (!file_exists(JPATH_CONFIGURATION.'/configuration.php') || (filesize(JPATH_CONFIGURATION.'/configuration.php') < 10) || file_exists(JPATH_INSTALLATION.'/index.php')) { +if (!file_exists(JPATH_CONFIGURATION.'/configuration.php') || (filesize(JPATH_CONFIGURATION.'/configuration.php') < 10) /*|| file_exists(JPATH_INSTALLATION.'/index.php')*/) { header('Location: ../installation/index.php'); exit(); } diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 19028f77be0fd..c7d77bcd15a5c 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,7 +6,7 @@ www.joomla.org (C) 2005 - 2014 Open Source Matters. All rights reserved GNU General Public License version 2 or later; see LICENSE.txt - 2.5.26 + 2.5.27-dev September 2014 FILES_JOOMLA_XML_DESCRIPTION diff --git a/includes/framework.php b/includes/framework.php index f14b5eb80d098..72e1c64bfeff4 100644 --- a/includes/framework.php +++ b/includes/framework.php @@ -20,7 +20,7 @@ // Installation check, and check on removal of the install directory. // -if (!file_exists(JPATH_CONFIGURATION.'/configuration.php') || (filesize(JPATH_CONFIGURATION.'/configuration.php') < 10) || file_exists(JPATH_INSTALLATION.'/index.php')) { +if (!file_exists(JPATH_CONFIGURATION.'/configuration.php') || (filesize(JPATH_CONFIGURATION.'/configuration.php') < 10) /*|| file_exists(JPATH_INSTALLATION.'/index.php')*/) { if (file_exists(JPATH_INSTALLATION.'/index.php')) { header('Location: '.substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], 'index.php')).'installation/index.php'); diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php index 96700ca9b47ba..cc42684171c85 100644 --- a/libraries/cms/version/version.php +++ b/libraries/cms/version/version.php @@ -23,10 +23,10 @@ final class JVersion public $RELEASE = '2.5'; /** @var string Maintenance version. */ - public $DEV_LEVEL = '26'; + public $DEV_LEVEL = '27-dev'; /** @var string Development STATUS. */ - public $DEV_STATUS = 'Stable'; + public $DEV_STATUS = 'Development'; /** @var string Build number. */ public $BUILD = '';