Merge remote-tracking branch 'SMF/release-2.1' into release-2.1

Sources/Subs-Boards.php

@@ -175,7 +175,7 @@ function MarkRead()
 	}
 	elseif (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'unreadreplies')
 	{
-		// Make sure all the boards are integers!
+		// Make sure all the topics are integers!
 		$topics = array_map('intval', explode('-', $_REQUEST['topics']));
 
 		$smcFunc['db_query']('', '

Sources/Subs.php

@@ -416,9 +416,8 @@ function updateMemberData($members, $data)
  *
  * @param array $changeArray
  * @param bool $update = false
- * @param bool $debug = false
  */
-function updateSettings($changeArray, $update = false, $debug = false)
+function updateSettings($changeArray, $update = false)
 {
 	global $modSettings, $smcFunc;
 

Sources/Subscriptions-PayPal.php

@@ -261,7 +261,7 @@ class paypal_payment
 			$this->_findSubscription();
 
 		// Verify the currency!
-		if (strtolower($_POST['mc_currency']) !== $modSettings['paid_currency_code'])
+		if (strtolower($_POST['mc_currency']) !== strtolower($modSettings['paid_currency_code']))
 			exit;
 
 		// Can't exist if it doesn't contain anything.

other/upgrade_2-1_mysql.sql

@@ -271,7 +271,7 @@ if (file_exists($GLOBALS['boarddir'] . '/Themes/core'))
 	$theme_request = upgrade_query("
 		SELECT id_theme
 		FROM {$db_prefix}themes
-		WHERE variable = {str:variable}
+		WHERE variable = 'theme_dir'
 			AND value ='$core_dir'");
 
 	// Don't do anything if this theme is already uninstalled