Skip to content

Commit bf97c70

Browse files
author
Michael Babker
committed
Reset for development
1 parent 0179992 commit bf97c70

File tree

6 files changed

+7
-5
lines changed

6 files changed

+7
-5
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Placeholder file for database changes for version 2.5.27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Placeholder file for database changes for version 2.5.27

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.26</version>
9+
<version>2.5.27-dev</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

+2-2
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 = '26';
26+
public $DEV_LEVEL = '27-dev';
2727

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

3131
/** @var string Build number. */
3232
public $BUILD = '';

0 commit comments

Comments
 (0)