Merge branch 'pr/264' into dev

qa-include/app/post-update.php

@@ -437,6 +437,8 @@
 		if ($oldquestion['type']!='Q_HIDDEN')
 			qa_fatal_error('Tried to delete a non-hidden question');
 
+		qa_report_event('q_delete_before', $userid, $handle, $cookieid, $params);
+
 		if (isset($oldclosepost) && ($oldclosepost['parentid']==$oldquestion['postid'])) {
 			qa_db_post_set_closed($oldquestion['postid'], null); // for foreign key constraint
 			qa_post_unindex($oldclosepost['postid']);
@@ -451,8 +453,6 @@
 			'oldquestion' => $oldquestion,
 		);
 
-		qa_report_event('q_delete_before', $userid, $handle, $cookieid, $params);
-
 		qa_post_unindex($oldquestion['postid']);
 		qa_db_post_delete($oldquestion['postid']); // also deletes any related voteds due to foreign key cascading
 		qa_update_counts_for_q(null);

qa-include/pages/admin/admin-default.php

@@ -1223,7 +1223,6 @@
 					$editors = qa_list_modules('editor');
 
 					$selectoptions = array();
-					$optionslinks = false;
 
 					foreach ($editors as $editor) {
 						$selectoptions[qa_html($editor)] = strlen($editor) ? qa_html($editor) : qa_lang_html('admin/basic_editor');

qa-include/pages/register.php

@@ -194,17 +194,6 @@
 		));
 	}
 
-	// show T&Cs checkbox
-	if ($show_terms) {
-		$qa_content['form']['fields']['terms'] = array(
-			'type' => 'checkbox',
-			'label' => trim(qa_opt('register_terms')),
-			'tags' => 'name="terms" id="terms"',
-			'value' => qa_html(@$interms),
-			'error' => qa_html(@$errors['terms']),
-		);
-	}
-
 	foreach ($userfields as $userfield) {
 		$value = @$inprofile[$userfield['fieldid']];
 
@@ -224,6 +213,17 @@
 	if (qa_opt('captcha_on_register'))
 		qa_set_up_captcha_field($qa_content, $qa_content['form']['fields'], @$errors);
 
+	// show T&Cs checkbox
+	if ($show_terms) {
+		$qa_content['form']['fields']['terms'] = array(
+			'type' => 'checkbox',
+			'label' => trim(qa_opt('register_terms')),
+			'tags' => 'name="terms" id="terms"',
+			'value' => qa_html(@$interms),
+			'error' => qa_html(@$errors['terms']),
+		);
+	}
+
 	$loginmodules = qa_load_modules_with('login', 'login_html');
 
 	foreach ($loginmodules as $module) {

qa-plugin/facebook-login/qa-facebook-login-page.php

@@ -22,14 +22,11 @@
 
 class qa_facebook_login_page
 {
-
 	private $directory;
-	private $urltoroot;
 
 	public function load_module($directory, $urltoroot)
 	{
 		$this->directory=$directory;
-		$this->urltoroot=$urltoroot;
 	}
 
 	public function match_request($request)

qa-plugin/xml-sitemap/qa-xml-sitemap.php

@@ -137,8 +137,6 @@ class qa_xml_sitemap
 	{
 		@ini_set('display_errors', 0); // we don't want to show PHP errors inside XML
 
-		$siteurl=qa_opt('site_url');
-
 		header('Content-type: text/xml; charset=utf-8');
 
 		echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
@@ -262,9 +260,6 @@ class qa_xml_sitemap
 			}
 		}
 
-
-	//	Finish up...
-
 		echo "</urlset>\n";
 
 		return null;