Changeset 2682:cac55fdd7178 for inc/core

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:

• inc/core/class.dc.core.php (modified) (3 diffs)

inc/core/class.dc.core.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
@@ -262 +262 @@
      @param    editor_id <b>string</b>  Editor id (dcLegacyEditor, dcCKEditor, ...)
      @return   <b>array</b> An array of formaters names in values.
+
+    /**
+    if @param editor_id is empty:
+    return all formaters sorted by actives editors
+    
+    if @param editor_id is not empty
+    return formaters for an editor if editor is active
+    return empty() array if editor is not active. 
+    It can happens when a user choose an editor and admin deactivate that editor later
      */
      public function getFormaters($editor_id='')
@@ -267 +276 @@
           $formaters_list = array();
 
-          if (!empty($editor_id) && isset($this->formaters[$editor_id])) {
-               $formaters_list = array_keys($this->formaters[$editor_id]);
+          if (!empty($editor_id)) {
+            if (isset($this->formaters[$editor_id])) {
+                $formaters_list = array_keys($this->formaters[$editor_id]);
+            }
           } else {
                foreach ($this->formaters as $editor => $formaters) {