Merge branch '3.1-stable' into develop

Conflicts resolved:
	system/database/drivers/sqlite/sqlite_driver.php
	system/database/drivers/sqlite/sqlite_forge.php
	system/database/drivers/sqlite/sqlite_result.php
	system/database/drivers/sqlite/sqlite_utility.php
	system/helpers/captcha_helper.php
	system/helpers/email_helper.php
	system/helpers/inflector_helper.php
	system/helpers/smiley_helper.php
	system/language/english/form_validation_lang.php
	system/libraries/Cart.php
	system/libraries/Form_validation.php
	system/libraries/Javascript.php
	system/libraries/Javascript/Jquery.php
	system/libraries/Session/SessionHandlerInterface.php
	tests/codeigniter/helpers/inflector_helper_test.php
	user_guide_src/source/helpers/inflector_helper.rst

1 files changed, 1 insertions, 1 deletions

diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php
index ffe0813f7..4e8c303c7 100644
--- a/system/libraries/Xmlrpc.php
+++ b/system/libraries/Xmlrpc.php
@@ -1211,7 +1211,7 @@ class XML_RPC_Message extends CI_Xmlrpc
 		{
 			echo '<pre>';
 
-			if (count($this->xh[$pname]['headers'] > 0))
+			if (count($this->xh[$pname]['headers']) > 0)
 			{
 				echo "---HEADERS---\n";
 				foreach ($this->xh[$pname]['headers'] as $header)