MyBB 1.8.7 patch

mybb · Mar 25, 2016 · c7a8925 · c7a8925
1 parent b7454e6
commit c7a8925
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/inc/cachehandlers/eaccelerator.php b/inc/cachehandlers/eaccelerator.php
@@ -107,7 +107,7 @@ function disconnect()
 	 *
 	 * @return string
 	 */
-	function size_of($name)
+	function size_of($name='')
 	{
 		global $lang;
 

diff --git a/inc/cachehandlers/interface.php b/inc/cachehandlers/interface.php
@@ -57,5 +57,5 @@ function disconnect();
 	 *
 	 * @return string
 	 */
-	function size_of($name);
+	function size_of($name='');
 }
diff --git a/inc/cachehandlers/memcache.php b/inc/cachehandlers/memcache.php
@@ -147,7 +147,7 @@ function disconnect()
 	 *
 	 * @return string
 	 */
-	function size_of($name)
+	function size_of($name='')
 	{
 		global $lang;
 

diff --git a/inc/cachehandlers/memcached.php b/inc/cachehandlers/memcached.php
@@ -147,7 +147,7 @@ function disconnect()
 	 *
 	 * @return string
 	 */
-	function size_of($name)
+	function size_of($name='')
 	{
 		global $lang;
 

diff --git a/inc/cachehandlers/xcache.php b/inc/cachehandlers/xcache.php
@@ -102,7 +102,7 @@ function disconnect()
 	 *
 	 * @return string
 	 */
-	function size_of($name)
+	function size_of($name='')
 	{
 		global $lang;
 

diff --git a/inc/class_parser.php b/inc/class_parser.php
@@ -658,7 +658,7 @@ function fix_javascript($message)
 	{
 		$js_array = array(
 			"#(&\#(0*)106;?|&\#(0*)74;?|&\#x(0*)4a;?|&\#x(0*)6a;?|j)((&\#(0*)97;?|&\#(0*)65;?|a)(&\#(0*)118;?|&\#(0*)86;?|v)(&\#(0*)97;?|&\#(0*)65;?|a)(\s)?(&\#(0*)115;?|&\#(0*)83;?|s)(&\#(0*)99;?|&\#(0*)67;?|c)(&\#(0*)114;?|&\#(0*)82;?|r)(&\#(0*)105;?|&\#(0*)73;?|i)(&\#112;?|&\#(0*)80;?|p)(&\#(0*)116;?|&\#(0*)84;?|t)(&\#(0*)58;?|\:))#i",
-			"#(on)([a-z]+\s?=)#i",
+			"#([\s\"']on)([a-z]+\s*=)#i",
 		);
 
 		// Add invisible white space

diff --git a/install/resources/upgrade35.php b/install/resources/upgrade35.php
@@ -45,7 +45,7 @@ function upgrade35_dbchanges()
 	}
 
 	// Remove "Are You a Human" captcha
-	$db->update_query('settings', array('value' => 1), "name='captchaimage' AND value=3");
+	$db->update_query('settings', array('value' => '1'), "name='captchaimage' AND value='3'");
 	$db->delete_query('settings', "name IN ('ayahpublisherkey', 'ayahscoringkey')");
 	$db->delete_query('templates', "title IN ('member_register_regimage_ayah', 'post_captcha_ayah')");
 

diff --git a/search.php b/search.php
@@ -247,7 +247,7 @@
 			// Normal moderators
 			$unapprove_forums = array();
 			$deleted_forums = array();
-			$unapproved_where = 't.visible = 1';
+			$unapproved_where = '(t.visible = 1';
 			while($moderator = $db->fetch_array($query))
 			{
 				if($moderator['canviewunapprove'] == 1)
@@ -269,6 +269,7 @@
 			{
 				$unapproved_where .= " OR (t.visible = -1 AND t.fid IN(".implode(',', $deleted_forums)."))";
 			}
+			$unapproved_where .= ')';
 		}
 		else
 		{
@@ -722,7 +723,7 @@
 			// Normal moderators
 			$unapprove_forums = array();
 			$deleted_forums = array();
-			$unapproved_where = 'visible = 1';
+			$unapproved_where = '(visible = 1';
 
 			while($moderator = $db->fetch_array($query))
 			{
@@ -745,6 +746,7 @@
 			{
 				$unapproved_where .= " OR (visible = -1 AND fid IN(".implode(',', $deleted_forums)."))";
 			}
+			$unapproved_where .= ')';
 		}
 		else
 		{