Prepare 3.3.6 hotfix

joomla · Oct 1, 2014 · 6141433 · 6141433
1 parent 7d2450c
commit 6141433
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/administrator/includes/framework.php b/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'))
 	{

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>3.3.6-dev</version>
+	<version>3.3.6</version>
 	<creationDate>September 2014</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 

diff --git a/includes/framework.php b/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'))
 	{

diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php
@@ -25,10 +25,10 @@ final class JVersion
 	public $RELEASE = '3.3';
 
 	/** @var  string  Maintenance version. */
-	public $DEV_LEVEL = '6-dev';
+	public $DEV_LEVEL = '6';
 
 	/** @var  string  Development STATUS. */
-	public $DEV_STATUS = 'Development';
+	public $DEV_STATUS = 'Stable';
 
 	/** @var  string  Build number. */
 	public $BUILD = '';
@@ -37,10 +37,10 @@ final class JVersion
 	public $CODENAME = 'Ember';
 
 	/** @var  string  Release date. */
-	public $RELDATE = '30-September-2014';
+	public $RELDATE = '01-October-2014';
 
 	/** @var  string  Release time. */
-	public $RELTIME = '14:00';
+	public $RELTIME = '02:00';
 
 	/** @var  string  Release timezone. */
 	public $RELTZ = 'GMT';