Changeset 2736:09dd799a19bd for admin/post.php

Timestamp:

08/25/14 09:20:20 (11 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Addresses #1896
Preferences: one editor for each available formats.

File:

• admin/post.php (modified) (6 diffs)

admin/post.php

@@ -60 +60 @@
 $img_status_pattern = '<img class="img_select_option" alt="%1$s" title="%1$s" src="images/%2$s" />';
 
-# Formaters combo
-$formaters_combo = dcAdminCombos::getFormatersCombo();
-foreach ($formaters_combo as $editor => $formats) {
+# Formats combo
+$core_formaters = $core->getFormaters();
+$available_formats = array('' => '');
+foreach ($core_formaters as $editor => $formats) {
      foreach ($formats as $format) {
-          $formaters_combo[$editor][$format] = "$editor:$format";
-     }
+        $available_formats[$format] = $format;
+    }
 }
 
@@ -78 +79 @@
 $TB = new dcTrackback($core);
 $tb_urls = $tb_excerpt = '';
-
-if (count($formaters_combo)==0 || !$core->auth->getOption('editor') || $core->auth->getOption('editor')=='') {
-     dcPage::addNotice("message",
-                           sprintf(__('Choose an active editor in %s.'),
-                                          '<a href="'.$core->adminurl->get("admin.user.preferences").'#user-options">'.__('your preferences').'</a>'
-                                          )
-                           );
-}
 
 # Get entry informations
@@ -195 +188 @@
 # Format excerpt and content
 elseif (!empty($_POST) && $can_edit_post) {
-    list(, $post_format) = explode(':', $_POST['post_format']);
+     $post_format = $_POST['post_format'];
      $post_excerpt = $_POST['post_excerpt'];
      $post_content = $_POST['post_content'];
@@ -382 +375 @@
 
 $admin_post_behavior = '';
-if (($core->auth->getOption('editor')==$post_editor)
-    && in_array($post_format, $core->getFormaters($core->auth->getOption('editor')))) {
-    $admin_post_behavior = $core->callBehavior('adminPostEditor');
+if (!empty($core->auth->getOption('editor')) && !empty($core->auth->getOption('editor')[$post_format])) {
+     $admin_post_behavior = $core->callBehavior('adminPostEditor', $core->auth->getOption('editor')[$post_format]);
 }
 
@@ -461 +453 @@
 -------------------------------------------------------- */
 if ($can_edit_post) {
-     if (count($formaters_combo)>0 && ($core->auth->getOption('editor') && $core->auth->getOption('editor')!='')) {
-        $post_format_field = form::combo('post_format',$formaters_combo,"$post_editor:$post_format",'maximal');
-     } else {
-          $post_format_field = sprintf(__('Choose an active editor in %s.'),
-          '<a href="'.$core->adminurl->get("admin.user.preferences").'#user-options">'.__('your preferences').'</a>'
-          );
-          $post_format_field .= form::hidden('post_format','xhtml');
-     }
-
      $sidebar_items = new ArrayObject(array(
           'status-box' => array(
@@ -489 +472 @@
                          '<div>'.
                          '<h5 id="label_format"><label for="post_format" class="classic">'.__('Text formatting').'</label></h5>'.
-                         '<p>'.$post_format_field.'</p>'.
+                         '<p>'.form::combo('post_format',$available_formats,$post_format,'maximal').'</p>'.
                          '<p class="format_control control_no_xhtml">'.
                          '<a id="convert-xhtml" class="button'.($post_id && $post_format != 'wiki' ? ' hide' : '').'" href="'.