Prepare 2.5.27 hotfix

joomla · Sep 30, 2014 · 46de4a7 · 46de4a7
1 parent bf97c70
commit 46de4a7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/administrator/components/com_joomlaupdate/restore.php b/administrator/components/com_joomlaupdate/restore.php
@@ -7341,7 +7341,7 @@ function masterSetup()
 		// Get the raw data
 		$raw = json_decode($json, true);
 
-		if (!empty($password) && (empty($password) || !isset($raw['factory'])))
+		if (!empty($password) && (empty($raw)))
 		{
 			die('###{"status":false,"message":"Invalid login"}###');
 		}

diff --git 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
@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>2.5.27-dev</version>
+	<version>2.5.27</version>
 	<creationDate>September 2014</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 

diff --git 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
@@ -23,10 +23,10 @@ final class JVersion
 	public $RELEASE = '2.5';
 
 	/** @var  string  Maintenance version. */
-	public $DEV_LEVEL = '27-dev';
+	public $DEV_LEVEL = '27';
 
 	/** @var  string  Development STATUS. */
-	public $DEV_STATUS = 'Development';
+	public $DEV_STATUS = 'Stable';
 
 	/** @var  string  Build number. */
 	public $BUILD = '';
@@ -35,7 +35,7 @@ final class JVersion
 	public $CODENAME = 'Ember';
 
 	/** @var  string  Release date. */
-	public $RELDATE = '23-September-2014';
+	public $RELDATE = '30-September-2014';
 
 	/** @var  string  Release time. */
 	public $RELTIME = '14:00';