Merge lp:~guiona/bilboplanet/669538 into lp:~greg-theclimber/bilboplanet/testing

[Guiona]

=== modified file 'inc/lib/simplepie/simplepie.inc'
--- inc/lib/simplepie/simplepie.inc	2010-09-21 14:34:02 +0000
+++ inc/lib/simplepie/simplepie.inc	2010-11-01 20:13:50 +0000
@@ -12151,7 +12151,7 @@
 		}
 		else
 		{
-			$this->query = $this->replace_invalid_with_pct_encoding($query, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~!$\'()*+,;:@/?');
+			$this->query = $this->replace_invalid_with_pct_encoding($query, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~!$\'()*+,;:@/?&=');
 		}
 		$this->valid[__FUNCTION__] = true;
 		return true;
@@ -12172,7 +12172,7 @@
 		}
 		else
 		{
-			$this->fragment = $this->replace_invalid_with_pct_encoding($fragment, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~!$&\'()*+,;=:@/?');
+			$this->fragment = $this->replace_invalid_with_pct_encoding($fragment, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~!$&\'()*+,;=:@/?&=');
 		}
 		$this->valid[__FUNCTION__] = true;
 		return true;