Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 46de4a7

Browse files
author
Michael Babker
committedSep 30, 2014
Prepare 2.5.27 hotfix
1 parent bf97c70 commit 46de4a7

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed
 

‎administrator/components/com_joomlaupdate/restore.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7341,7 +7341,7 @@ function masterSetup()
73417341
// Get the raw data
73427342
$raw = json_decode($json, true);
73437343

7344-
if (!empty($password) && (empty($password) || !isset($raw['factory'])))
7344+
if (!empty($password) && (empty($raw)))
73457345
{
73467346
die('###{"status":false,"message":"Invalid login"}###');
73477347
}

‎administrator/includes/framework.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/*
2020
* Installation check, and check on removal of the install directory.
2121
*/
22-
if (!file_exists(JPATH_CONFIGURATION.'/configuration.php') || (filesize(JPATH_CONFIGURATION.'/configuration.php') < 10) /*|| file_exists(JPATH_INSTALLATION.'/index.php')*/) {
22+
if (!file_exists(JPATH_CONFIGURATION.'/configuration.php') || (filesize(JPATH_CONFIGURATION.'/configuration.php') < 10) || file_exists(JPATH_INSTALLATION.'/index.php')) {
2323
header('Location: ../installation/index.php');
2424
exit();
2525
}

‎administrator/manifests/files/joomla.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<authorUrl>www.joomla.org</authorUrl>
77
<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
9-
<version>2.5.27-dev</version>
9+
<version>2.5.27</version>
1010
<creationDate>September 2014</creationDate>
1111
<description>FILES_JOOMLA_XML_DESCRIPTION</description>
1212

‎includes/framework.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// Installation check, and check on removal of the install directory.
2121
//
2222

23-
if (!file_exists(JPATH_CONFIGURATION.'/configuration.php') || (filesize(JPATH_CONFIGURATION.'/configuration.php') < 10) /*|| file_exists(JPATH_INSTALLATION.'/index.php')*/) {
23+
if (!file_exists(JPATH_CONFIGURATION.'/configuration.php') || (filesize(JPATH_CONFIGURATION.'/configuration.php') < 10) || file_exists(JPATH_INSTALLATION.'/index.php')) {
2424

2525
if (file_exists(JPATH_INSTALLATION.'/index.php')) {
2626
header('Location: '.substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], 'index.php')).'installation/index.php');

‎libraries/cms/version/version.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ final class JVersion
2323
public $RELEASE = '2.5';
2424

2525
/** @var string Maintenance version. */
26-
public $DEV_LEVEL = '27-dev';
26+
public $DEV_LEVEL = '27';
2727

2828
/** @var string Development STATUS. */
29-
public $DEV_STATUS = 'Development';
29+
public $DEV_STATUS = 'Stable';
3030

3131
/** @var string Build number. */
3232
public $BUILD = '';
@@ -35,7 +35,7 @@ final class JVersion
3535
public $CODENAME = 'Ember';
3636

3737
/** @var string Release date. */
38-
public $RELDATE = '23-September-2014';
38+
public $RELDATE = '30-September-2014';
3939

4040
/** @var string Release time. */
4141
public $RELTIME = '14:00';

0 commit comments

Comments
 (0)
Please sign in to comment.