Merge pull request #938 from Arantor/release-2.1

! Disable debugging from within the popups. (fixes #919)

Sources/PersonalMessage.php

@@ -378,7 +378,10 @@ function messageIndexBar($area)
  */
 function MessagePopup()
 {
-	global $context, $modSettings, $smcFunc, $memberContext, $scripturl, $user_settings;
+	global $context, $modSettings, $smcFunc, $memberContext, $scripturl, $user_settings, $db_show_debug;
+
+	// We do not want to output debug information here.
+	$db_show_debug = false;
 
 	// We only want to output our little layer here.
 	$context['template_layers'] = array();

Sources/Profile.php

@@ -704,7 +704,10 @@ function ModifyProfile($post_errors = array())
  */
 function profile_popup($memID)
 {
-	global $context, $scripturl, $txt;
+	global $context, $scripturl, $txt, $db_show_debug;
+
+	// We do not want to output debug information here.
+	$db_show_debug = false;
 
 	// We only want to output our little layer here.
 	$context['template_layers'] = array();