From ba710f28187b0012396c385e268f1fb9f250ee22 Mon Sep 17 00:00:00 2001
From: Michael Babker <mbabker@flbab.com>
Date: Mon, 22 Sep 2014 09:02:32 -0400
Subject: [PATCH] Prepare 2.5.25 release

---
 administrator/includes/framework.php     | 2 +-
 administrator/manifests/files/joomla.xml | 4 ++--
 includes/framework.php                   | 2 +-
 libraries/cms/version/version.php        | 8 ++++----
 plugins/authentication/ldap/ldap.php     | 4 ++++
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/administrator/includes/framework.php b/administrator/includes/framework.php
index 0dae993d0fc65..7c6610b5ecd9c 100644
--- a/administrator/includes/framework.php
+++ b/administrator/includes/framework.php
@@ -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();
 }
diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
index 69d94f49ea8d8..d7b59cdd23801 100644
--- 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>2.5.25-dev</version>
-	<creationDate>July 2014</creationDate>
+	<version>2.5.25</version>
+	<creationDate>September 2014</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>
diff --git a/includes/framework.php b/includes/framework.php
index 72e1c64bfeff4..f14b5eb80d098 100644
--- a/includes/framework.php
+++ b/includes/framework.php
@@ -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');
diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php
index 88588bd7cc515..bd2fb8227f31a 100644
--- a/libraries/cms/version/version.php
+++ b/libraries/cms/version/version.php
@@ -23,10 +23,10 @@ final class JVersion
 	public $RELEASE = '2.5';
 
 	/** @var  string  Maintenance version. */
-	public $DEV_LEVEL = '25-dev';
+	public $DEV_LEVEL = '25';
 
 	/** @var  string  Development STATUS. */
-	public $DEV_STATUS = 'Development';
+	public $DEV_STATUS = 'Stable';
 
 	/** @var  string  Build number. */
 	public $BUILD = '';
@@ -35,10 +35,10 @@ final class JVersion
 	public $CODENAME = 'Ember';
 
 	/** @var  string  Release date. */
-	public $RELDATE = '25-July-2014';
+	public $RELDATE = '23-September-2014';
 
 	/** @var  string  Release time. */
-	public $RELTIME = '13:00';
+	public $RELTIME = '14:00';
 
 	/** @var  string  Release timezone. */
 	public $RELTZ = 'GMT';
diff --git a/plugins/authentication/ldap/ldap.php b/plugins/authentication/ldap/ldap.php
index 2fdd02bde10c1..24aaf26e24fb8 100644
--- a/plugins/authentication/ldap/ldap.php
+++ b/plugins/authentication/ldap/ldap.php
@@ -36,6 +36,10 @@ 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']))
 		{