Prepare 3.2.5 release

joomla · Sep 22, 2014 · baff564 · baff564
1 parent 1a0b7a0
commit baff564
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/administrator/components/com_media/models/manager.php b/administrator/components/com_media/models/manager.php
@@ -90,7 +90,7 @@ function getFolderList($base = null)
 		// so both string and integer are supported.
 		if ($asset == 0)
 		{
-			$asset = $input->get('asset', 0, 'string');
+			$asset = $input->get('asset', 0, 'cmd');
 		}
 
 		$author = $input->get('author', 0, 'integer');

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 - 2014 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.2.4</version>
-	<creationDate>April 2014</creationDate>
+	<version>3.2.5</version>
+	<creationDate>September 2014</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>

diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php
@@ -25,7 +25,7 @@ final class JVersion
 	public $RELEASE = '3.2';
 
 	/** @var  string  Maintenance version. */
-	public $DEV_LEVEL = '4';
+	public $DEV_LEVEL = '5';
 
 	/** @var  string  Development STATUS. */
 	public $DEV_STATUS = 'Stable';
@@ -37,7 +37,7 @@ final class JVersion
 	public $CODENAME = 'Ember';
 
 	/** @var  string  Release date. */
-	public $RELDATE = '30-April-2014';
+	public $RELDATE = '23-September-2014';
 
 	/** @var  string  Release time. */
 	public $RELTIME = '14:00';

diff --git a/plugins/authentication/ldap/ldap.php b/plugins/authentication/ldap/ldap.php
@@ -38,6 +38,9 @@ public function onUserAuthenticate($credentials, $options, &$response)
 		// For JLog
 		$response->type = 'LDAP';
 
+		// Strip null bytes from the password
+		$credentials['password'] = str_replace(chr(0), '', $credentials['password']);
+
 		// LDAP does not like Blank passwords (tries to Anon Bind which is bad)
 		if (empty($credentials['password']))
 		{