Prepare for 2.5.2 release

joomla · Mar 5, 2012 · be10a23 · lvj · Mar 13, 2012 · be10a23
1 parent 830c8c5
commit be10a23
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 9 deletions.
diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
@@ -6,8 +6,8 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<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.1</version>
-	<creationDate>February 2012</creationDate>
+	<version>2.5.2</version>
+	<creationDate>March 2012</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>

diff --git a/installation/CHANGELOG b/installation/CHANGELOG
@@ -26,6 +26,8 @@ $ -> Language fix or change
 - -> Removed
 ! -> Note
 
+-------------------- 2.5.2 Stable Release [05-Mar-2012] ------------------
+
 -------------------- 2.5.1 Stable Release [02-Feb-2012] ------------------
 
 01-Feb-2012 Mark Dexter

diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
@@ -536,7 +536,7 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`
 (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":"admin@joomla.org","authorUrl":"www.joomla.org","version":"2.5.1","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":"January 2012","author":"Joomla!","copyright":"(C) 2005 - 2012 Open Source Matters. All rights reserved","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"2.5.2","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);

diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql
diff --git a/installation/sql/sqlsrv/joomla.sql b/installation/sql/sqlsrv/joomla.sql
diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php
@@ -23,7 +23,7 @@ final class JVersion
 	public $RELEASE = '2.5';
 
 	/** @var  string  Maintenance version. */
-	public $DEV_LEVEL = '1';
+	public $DEV_LEVEL = '2';
 
 	/** @var  string  Development STATUS. */
 	public $DEV_STATUS = 'Stable';
@@ -35,7 +35,7 @@ final class JVersion
 	public $CODENAME = 'Ember';
 
 	/** @var  string  Release date. */
-	public $RELDATE = '2-Feb-2012';
+	public $RELDATE = '5-March-2012';
 
 	/** @var  string  Release time. */
 	public $RELTIME = '14:00';

diff --git a/plugins/system/highlight/highlight.php b/plugins/system/highlight/highlight.php
@@ -64,9 +64,18 @@ public function onAfterDispatch()
 		{
 			return true;
 		}
+
+		// Clean the terms array
+		$filter = JFilterInput::getInstance();
+
+		$cleanTerms = array();
+		foreach ($terms as $term)
+		{
+			$cleanTerms[] = $filter->clean($term, 'string');
+		}
 
 		// Activate the highlighter.
-		JHtml::_('behavior.highlighter', $terms);
+		JHtml::_('behavior.highlighter', $cleanTerms);
 
 		// Adjust the component buffer.
 		$doc = JFactory::getDocument();

diff --git a/plugins/system/redirect/redirect.php b/plugins/system/redirect/redirect.php
@@ -67,7 +67,7 @@ static function handleError(&$error)
 			{
 				$referer = empty($_SERVER['HTTP_REFERER']) ? '' : $_SERVER['HTTP_REFERER'];
 
-				$db->setQuery('select id from '.$db->quoteName('#__redirect_links')."  where old_url='".$current."'");
+				$db->setQuery('select id from '.$db->quoteName('#__redirect_links')."  where old_url='" . $db->quote($current) . "'");
 				$res = $db->loadResult();
 				if(!$res) {