Skip to content
Browse files

Prepare 3.2.1 development

  • Loading branch information...
1 parent acb7a63 commit 334021ade465cd9fab42fdf1f918c7aa3ebb265e @mbabker mbabker committed
View
1 administrator/components/com_admin/sql/updates/mysql/3.2.1.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.2.1
View
1 administrator/components/com_admin/sql/updates/postgresql/3.2.1.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.2.1
View
1 administrator/components/com_admin/sql/updates/sqlazure/3.2.1.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.2.1
View
2 administrator/includes/framework.php
@@ -13,7 +13,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'))
+ || (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10) /*|| file_exists(JPATH_INSTALLATION . '/index.php')*/)
{
if (file_exists(JPATH_INSTALLATION . '/index.php'))
{
View
2 administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
<authorUrl>www.joomla.org</authorUrl>
<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
- <version>3.2.0</version>
+ <version>3.2.1</version>
<creationDate>November 2013</creationDate>
<description>FILES_JOOMLA_XML_DESCRIPTION</description>
View
2 includes/framework.php
@@ -13,7 +13,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'))
+ || (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10) /*|| file_exists(JPATH_INSTALLATION . '/index.php')*/)
{
if (file_exists(JPATH_INSTALLATION . '/index.php'))
{
View
2 libraries/cms/version/version.php
@@ -25,7 +25,7 @@
public $RELEASE = '3.2';
/** @var string Maintenance version. */
- public $DEV_LEVEL = '0';
+ public $DEV_LEVEL = '1';
/** @var string Development STATUS. */
public $DEV_STATUS = 'Stable';

0 comments on commit 334021a

Please sign in to comment.
Something went wrong with that request. Please try again.