Browse Source

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

Yannick Warnier 10 years ago
parent
commit
ff78fbbf93

+ 4 - 0
main/admin/configure_plugin.php

@@ -89,6 +89,10 @@ if (isset($form)) {
 
         header("Location: $currentUrl");
         exit;
+    } else {
+        foreach ($form->_errors as $error) {
+            $message .= Display::return_message($error, 'error');
+        }
     }
 }
 

+ 1 - 2
main/auth/courses_controller.php

@@ -553,8 +553,7 @@ class CoursesController
 
         $key = 'name';
         $catalogSessionAutoSubscriptionAllowed = false;
-        if (isset($_configuration['catalog_allow_session_auto_subscription']) &&
-            $_configuration['catalog_allow_session_auto_subscription']) {
+        if (api_get_configuration_value('catalog_allow_session_auto_subscription')) {
             $key = 'id';
             $catalogSessionAutoSubscriptionAllowed = true;
         }

+ 5 - 0
main/inc/lib/api.lib.php

@@ -5235,6 +5235,11 @@ function api_add_setting($val, $var, $sk = null, $type = 'textfield', $c = null,
     $res = Database::query($select);
     if (Database::num_rows($res) > 0) { // Found item for this access_url.
         $row = Database::fetch_array($res);
+        Database::update(
+            $t_settings,
+            array('selected_value' => $val),
+            array('id = ?' => array($row['id']))
+        );
         return $row['id'];
     }
 

+ 1 - 1
main/inc/lib/plugin.class.php

@@ -202,7 +202,7 @@ class Plugin
                     $result->addElement('html', $this->get_lang($name));
                     break;
                 case 'wysiwyg':
-                    $result->addHtmlEditor($name, $this->get_lang($name));
+                    $result->addHtmlEditor($name, $this->get_lang($name), false);
                     break;
                 case 'text':
                     $result->addElement($type, $name, array($this->get_lang($name), $help));

+ 1 - 1
plugin/advanced_subscription/views/admin_view.tpl

@@ -50,7 +50,7 @@
                         </td>
                         <td>{{ student.created_at }}</td>
                         <td>{{ student.area }}</td>
-                        {% set cellClass = 'important'%}
+                        {% set cellClass = 'danger'%}
                         {% if student.validation == 'Yes' %}
                             {% set cellClass = 'success'%}
                         {% endif %}