Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

main/exercise/UniqueAnswerImage.php

@@ -425,29 +425,4 @@ class UniqueAnswerImage extends UniqueAnswer
         $this->updateWeighting($questionWeighting);
         $this->save($exercise);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function return_header(Exercise $exercise, $counter = null, $score = [])
-    {
-        if ($exercise->showExpectedChoice()) {
-            $header = '<table class="'.$this->question_table_class.'">
-			<tr>
-				<th>'.get_lang('Choice').'</th>';
-            if ($exercise->showExpectedChoiceColumn()) {
-                $header .= '<th>'.get_lang('ExpectedChoice').'</th>';
-            }
-            $header .= '<th>'.get_lang('Answer').'</th>';
-            $header .= '<th>'.get_lang('Status').'</th>';
-            if (false === $exercise->hideComment) {
-                $header .= '<th>'.get_lang('Comment').'</th>';
-            }
-            $header .= '</tr>';
-        } else {
-            $header = parent::return_header($exercise, $counter, $score);
-        }
-
-        return $header;
-    }
 }

main/inc/local.inc.php

@@ -281,9 +281,7 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
 
         $load = true;
         if (isset($cas['skip_force_redirect_in'])) {
-            $skipCas = [
-                '/main/webservices/',
-            ];
+            $skipCas = $cas['skip_force_redirect_in'];
             foreach ($skipCas as $folder) {
                 if (false !== strpos($_SERVER['REQUEST_URI'], $folder)) {
                     $load = false;