Fixed Shortcode Bug #120

QuizandSurveyMaster · Feb 9, 2015 · 387a28c · 387a28c
1 parent fc8edca
commit 387a28c
Showing 1 changed file with 5 additions and 12 deletions.
diff --git a/includes/qmn_quiz.php b/includes/qmn_quiz.php
@@ -61,6 +61,11 @@ public function display_shortcode($atts)
 		$return_display = '';
 		$qmn_quiz_options = $this->load_quiz_options($quiz);
 
+		if (is_null($qmn_quiz_options) || $qmn_quiz_options->quiz_name == '')
+		{
+			return "It appears that this quiz is not set up correctly";
+		}
+
 		$qmn_array_for_variables = array(
 			'quiz_id' => $qmn_quiz_options->quiz_id,
 			'quiz_name' => $qmn_quiz_options->quiz_name,
@@ -1046,18 +1051,6 @@ function qmn_total_user_tries_check($display, $qmn_quiz_options, $qmn_array_for_
 	return $display;
 }
 
-add_filter('qmn_begin_shortcode', 'qmn_quiz_name_check', 10, 3);
-function qmn_quiz_name_check($display, $qmn_quiz_options, $qmn_array_for_variables)
-{
-	global $qmn_allowed_visit;
-	if ($qmn_quiz_options->quiz_name == "")
-	{
-		$qmn_allowed_visit = false;
-		$display .= __("It appears that this quiz is not set up correctly.", 'quiz-master-next');
-	}
-	return $display;
-}
-
 add_filter('qmn_begin_quiz', 'qmn_total_tries_check', 10, 3);
 function qmn_total_tries_check($display, $qmn_quiz_options, $qmn_array_for_variables)
 {