Merge remote-tracking branch 'atutor/master'

atutor · Sep 10, 2016 · 1429248 · 1429248
2 parents 8c944e0 + d66a086
commit 1429248
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/include/html/search.inc.php b/include/html/search.inc.php
@@ -63,19 +63,10 @@
 		$checked_display_as_summaries = ' checked="checked"';
 	}
 
-	// search within options
-	if ($_GET['search_within']=='content'){
-		$checked_sw_content = ' checked="checked"';
-	} elseif ($_GET['search_within']=='forums') {
-		$checked_sw_forums = ' checked="checked"';
-	} else {
-		$checked_sw_all = ' checked="checked"';
-	}
 
 } else {
 	// default values:
 	$checked_include_all      = ' checked="checked"';
-	$checked_sw_all			  = ' checked="checked"';
 
 	if ($_SESSION['course_id'] > 0) {
 		$checked_find_in_course   = ' checked="checked"';
@@ -88,6 +79,16 @@
 		$checked_display_as_summaries = ' checked="checked"';
 	}
 }
+
+// search within options
+if ($_GET['search_within']=='content'){
+	$checked_sw_content = ' checked="checked"';
+} elseif ($_GET['search_within']=='forums') {
+	$checked_sw_forums = ' checked="checked"';
+} else {
+	$checked_sw_all = ' checked="checked"';
+}
+
 if (isset($_GET['search']) && !$_GET['words']) {
 	$msg->printErrors('SEARCH_TERM_REQUIRED');
 	$_GET = array();
@@ -198,6 +199,7 @@
 	echo '<a name="search_results" tabindex="1"></a><h3 id="search_results">'.$num_found.' '._AT('search_results').'</h3>';
 
 	if (!$num_found) {
+		global $savant;
 		$msg->printInfos('NO_SEARCH_RESULTS');
 		require(AT_INCLUDE_PATH.'footer.inc.php');
 		exit;

diff --git a/include/lib/vital_funcs.inc.php b/include/lib/vital_funcs.inc.php
@@ -1202,7 +1202,7 @@ function escape_all_supers(){
         if(!is_array($_GET[$key])){
             $_GET[$key] = htmlspecialchars($_GET[$key]);
         } else{
-            if($_GET['qti_export_version']){
+            if(isset($_GET['qti_export_version'])){
                     // don't do anything
                     // hack to prevent filter when selecting a question to edit.
                     // the array the URL has attached needs to stay intact for the question editor