Browse Source

Merge remote-tracking branch 'origin/1.11.x' into 1.11.x

Yannick Warnier 8 years ago
parent
commit
f7217e6ad6

+ 1 - 0
app/Resources/public/css/base.css

@@ -5759,6 +5759,7 @@ ul#toolnavbox li a {
     font-size: 12px;
     width: 200px;
     height: 35px;
+    margin-left:-160px;
 }
 ul#toolnavbox .tool-img{
     margin-left: 5px;

+ 1 - 1
main/inc/lib/pear/HTML/QuickForm/select.php

@@ -122,7 +122,7 @@ class HTML_QuickForm_select extends HTML_QuickForm_element
      * @return    PEAR_Error on error or true
      * @throws    PEAR_Error
      */
-    private function load(&$options, $param1=null, $param2=null, $param3=null, $param4=null)
+    protected function load(&$options, $param1=null, $param2=null, $param3=null, $param4=null)
     {
         switch (true) {
             case is_array($options):

+ 4 - 4
main/survey/survey.lib.php

@@ -2254,7 +2254,7 @@ class SurveyUtil
                             survey_id='" . intval($_GET['survey_id']) . "' AND
                             question_id = '" . intval($question['question_id']) . "'";
                 $result = Database::query($sql);
-                while ($row = Database::fetch_array($result)) {
+                while ($row = Database::fetch_array($result, 'ASSOC')) {
                     echo $row['option_id'] . '<hr noshade="noshade" size="1" />';
                 }
             } else {
@@ -2266,7 +2266,7 @@ class SurveyUtil
                             AND question_id = '" . intval($question['question_id']) . "'
                         ORDER BY sort ASC";
                 $result = Database::query($sql);
-                while ($row = Database::fetch_array($result)) {
+                while ($row = Database::fetch_array($result, 'ASSOC')) {
                     $options[$row['question_option_id']] = $row;
                 }
                 // Getting the answers
@@ -2279,7 +2279,7 @@ class SurveyUtil
                 $result = Database::query($sql);
                 $number_of_answers = array();
                 $data = array();
-                while ($row = Database::fetch_array($result)) {
+                while ($row = Database::fetch_array($result, 'ASSOC')) {
                     if (!isset($number_of_answers[$row['question_id']])) {
                         $number_of_answers[$row['question_id']] = 0;
                     }
@@ -2376,7 +2376,7 @@ class SurveyUtil
                         $sql_restriction";
             $result = Database::query($sql);
             echo '<ul>';
-            while ($row = Database::fetch_array($result)) {
+            while ($row = Database::fetch_array($result, 'ASSOC')) {
                 $user_info = api_get_user_info($row['user']);
                 echo '<li><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=userreport&survey_id='.$surveyId.'&user='.$row['user'].'">'.$user_info['complete_name'].'</a></li>';
             }