[Joomla-commits] r22962 - in development/trunk: administrator/includes administrator/manifests/files includes installation installation/sql/mysql installation/sql/sqlazure libraries/cms/version
githu...@jcode001.directrouter.com
Date: 2012-03-29 12:46:25 -0500 (Thu, 29 Mar 2012)
New Revision: 22962
Modified:
development/trunk/administrator/includes/framework.php
development/trunk/administrator/manifests/files/joomla.xml
development/trunk/includes/framework.php
development/trunk/installation/CHANGELOG
development/trunk/installation/sql/mysql/joomla.sql
development/trunk/installation/sql/sqlazure/joomla.sql
development/trunk/libraries/cms/version/version.php
Log:
Merge branch 'master' of github.com:joomla/joomla-cms
Modified: development/trunk/administrator/includes/framework.php
===================================================================
--- development/trunk/administrator/includes/framework.php 2012-03-29 16:46:30 UTC (rev 22961)
+++ development/trunk/administrator/includes/framework.php 2012-03-29 17:46:25 UTC (rev 22962)
@@ -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();
}
Modified: development/trunk/administrator/manifests/files/joomla.xml
===================================================================
--- development/trunk/administrator/manifests/files/joomla.xml 2012-03-29 16:46:30 UTC (rev 22961)
+++ development/trunk/administrator/manifests/files/joomla.xml 2012-03-29 17:46:25 UTC (rev 22962)
@@ -7,7 +7,7 @@
<copyright>(C) 2005 - 2012 Open Source Matters. All rights reserved</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<version>2.5.4</version>
- <creationDate>March 2012</creationDate>
+ <creationDate>April 2012</creationDate>
<description>FILES_JOOMLA_XML_DESCRIPTION</description>
<scriptfile>administrator/components/com_admin/script.php</scriptfile>
Modified: development/trunk/includes/framework.php
===================================================================
--- development/trunk/includes/framework.php 2012-03-29 16:46:30 UTC (rev 22961)
+++ development/trunk/includes/framework.php 2012-03-29 17:46:25 UTC (rev 22962)
@@ -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');
Modified: development/trunk/installation/CHANGELOG
===================================================================
--- development/trunk/installation/CHANGELOG 2012-03-29 16:46:30 UTC (rev 22961)
+++ development/trunk/installation/CHANGELOG 2012-03-29 17:46:25 UTC (rev 22962)
@@ -26,6 +26,8 @@
- -> Removed
! -> Note
+-------------------- 2.5.4 Stable Release [2-April-2012] ------------------
+
29-Mar-2012 Mark Dexter
# [#28323] com_joomlaupdate does not delete joomla.xml file in root folder
# [#28318] Remove duplicate SQL Server directories.
Modified: development/trunk/installation/sql/mysql/joomla.sql
===================================================================
--- development/trunk/installation/sql/mysql/joomla.sql 2012-03-29 16:46:30 UTC (rev 22961)
+++ development/trunk/installation/sql/mysql/joomla.sql 2012-03-29 17:46:25 UTC (rev 22962)
@@ -419,7 +419,7 @@
(24, 'com_redirect', 'component', 'com_redirect', '', 1, 1, 0, 1, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(25, 'com_users', 'component', 'com_users', '', 1, 1, 0, 1, '', '{"allowUserRegistration":"1","new_usertype":"2","useractivation":"1","frontend_userparams":"1","mailSubjectPrefix":"","mailBodySuffix":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(27, 'com_finder', 'component', 'com_finder', '', 1, 1, 0, 0, '', '{"show_description":"1","description_length":255,"allow_empty_query":"0","show_url":"1","show_advanced":"1","expand_advanced":"0","show_date_filters":"0","highlight_terms":"1","opensearch_name":"","opensearch_description":"","batch_size":"50","memory_table_limit":30000,"title_multiplier":"1.7","text_multiplier":"0.7","meta_multiplier":"1.2","path_multiplier":"2.0","misc_multiplier":"0.3","stemmer":"snowball"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(28, 'com_joomlaupdate', 'component', 'com_joomlaupdate', '', 1, 1, 0, 1, '{"legacy":false,"name":"com_joomlaupdate","type":"component","creationDate":"February 2012","author":"Joomla! Project","copyright":"(C) 2005 - 2012 Open Source Matters. All rights reserved.","authorEmail":"ad...@joomla.org","authorUrl":"www.joomla.org","version":"2.5.2","description":"COM_JOOMLAUPDATE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+(28, 'com_joomlaupdate', 'component', 'com_joomlaupdate', '', 1, 1, 0, 1, '{"legacy":false,"name":"com_joomlaupdate","type":"component","creationDate":"February 2012","author":"Joomla! Project","copyright":"(C) 2005 - 2012 Open Source Matters. All rights reserved.","authorEmail":"ad...@joomla.org","authorUrl":"www.joomla.org","version":"2.5.0","description":"COM_JOOMLAUPDATE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
# Libraries
INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
@@ -538,7 +538,7 @@
(601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
-(700, 'Joomla! CMS', 'file', 'joomla', '', 0, 1, 1, 1, '{"legacy":false,"name":"files_joomla","type":"file","creationDate":"January 2012","author":"Joomla!","copyright":"(C) 2005 - 2012 Open Source Matters. All rights reserved","authorEmail":"ad...@joomla.org","authorUrl":"www.joomla.org","version":"2.5.4","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+(700, 'Joomla! CMS', 'file', 'joomla', '', 0, 1, 1, 1, '{"legacy":false,"name":"files_joomla","type":"file","creationDate":"April 2012","author":"Joomla!","copyright":"(C) 2005 - 2012 Open Source Matters. All rights reserved","authorEmail":"ad...@joomla.org","authorUrl":"www.joomla.org","version":"2.5.4","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
(800, 'joomla', 'package', 'pkg_joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
Modified: development/trunk/installation/sql/sqlazure/joomla.sql
===================================================================
--- development/trunk/installation/sql/sqlazure/joomla.sql 2012-03-29 16:46:30 UTC (rev 22961)
+++ development/trunk/installation/sql/sqlazure/joomla.sql 2012-03-29 17:46:25 UTC (rev 22962)
@@ -2853,7 +2853,7 @@
INSERT INTO #__extensions (extension_id, name, type, element, folder, client_id, enabled, access, protected, manifest_cache, params, custom_data, system_data, checked_out, checked_out_time, ordering, state)
-VALUES (700, 'Joomla! CMS', 'file', 'joomla', '', 0, 1, 1, 1, '{"legacy":false,"name":"files_joomla","type":"file","creationDate":"December 2011","author":"Joomla!","copyright":"(C) 2005 - 2011 Open Source Matters. All rights reserved","authorEmail":"ad...@joomla.org","authorUrl":"www.joomla.org","version":"2.5.4","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '1900-01-01 00:00:00', 0, 0);
+VALUES (700, 'Joomla! CMS', 'file', 'joomla', '', 0, 1, 1, 1, '{"legacy":false,"name":"files_joomla","type":"file","creationDate":"April 2012","author":"Joomla!","copyright":"(C) 2005 - 2011 Open Source Matters. All rights reserved","authorEmail":"ad...@joomla.org","authorUrl":"www.joomla.org","version":"2.5.4","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '1900-01-01 00:00:00', 0, 0);
INSERT INTO #__extensions (extension_id, name,type, element, folder, client_id, enabled, access, protected, manifest_cache, params, custom_data, system_data, checked_out, checked_out_time, ordering, state) VALUES
(800, 'joomla', 'package', 'pkg_joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0);
Modified: development/trunk/libraries/cms/version/version.php
===================================================================
--- development/trunk/libraries/cms/version/version.php 2012-03-29 16:46:30 UTC (rev 22961)
+++ development/trunk/libraries/cms/version/version.php 2012-03-29 17:46:25 UTC (rev 22962)
@@ -35,7 +35,7 @@
public $CODENAME = 'Ember';
/** @var string Release date. */
- public $RELDATE = '26-March-2012';
+ public $RELDATE = '2-April-2012';
/** @var string Release time. */
public $RELTIME = '14:00';
_______________________________________________
Joomla-commits mailing list
Joomla-...@joomlacode.org
http://joomlacode.org/mailman/listinfo/joomla-commits