Changeset 2682:cac55fdd7178 for admin/preferences.php

Timestamp:

03/11/14 20:46:03 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Children:

2683:fb8aa74332f1, 2684:599c0d392db2

Message:

Addresses #1896. Multiple editors.
Fix issue when no editor is activated or when choosen editor has been deactivated.

File:

• admin/preferences.php (modified) (3 diffs)

admin/preferences.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2014 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -68 +68 @@
 $formaters_combo = dcAdminCombos::getFormatersCombo();
 
-if (!empty($user_options['editor'])) {
+if (!empty($user_options['editor']) && !empty($formaters_combo[$user_options['editor']])) {
     $formaters_combo_editor = $formaters_combo[$user_options['editor']];
 } elseif (count($editors)!=0) {
@@ -468 +468 @@
 '</div>';
 
+// hide editor selector if less than 2 editors
+if (count($editors)<2) {
+    $editor_class = ' hidden';    
+} else {
+    $editor_class = '';
+}
+
 echo
 '<div class="fieldset">'.
 '<h4>'.__('Edition').'</h4>'.
 
-'<p class="field"><label for="user_editor">'.__('Preferred editor:').'</label>'.
+'<p class="field'.$editor_class.'"><label for="user_editor">'.__('Preferred editor:').'</label>'.
 form::combo('user_editor',$editors_combo,$user_options['editor']).'</p>'.