Changeset 2719:116bb4bd1b88

Timestamp:

06/14/14 11:52:47 (11 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Do not store editor in meta. Addresses #1896

File:

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

admin/post.php

@@ -103 +103 @@
           $post_dt = date('Y-m-d H:i',strtotime($post->post_dt));
           $post_format = $post->post_format;
-        # try to retrieve editor from post meta
-        $meta_editor = $core->meta->getMetaStr($post->post_meta,'editor');
-        if (!empty($meta_editor)) {
-            $post_editor = $meta_editor;
-        }
           $post_password = $post->post_password;
           $post_url = $post->post_url;
@@ -200 +195 @@
 # Format excerpt and content
 elseif (!empty($_POST) && $can_edit_post) {
-
-     if (strpos($_POST['post_format'], ':')!==false) {
-          list($post_editor, $post_format) = explode(':', $_POST['post_format']);
-     } else {
-          $post_format = $_POST['post_format'];
-          $post_editor = '';
-     }
-
+    list(, $post_format) = explode(':', $_POST['post_format']);
      $post_excerpt = $_POST['post_excerpt'];
      $post_content = $_POST['post_content'];
@@ -295 +283 @@
      $cur->post_dt = $post_dt ? date('Y-m-d H:i:00',strtotime($post_dt)) : '';
      $cur->post_format = $post_format;
-     $cur->post_meta = serialize(array('editor' => $post_editor));
      $cur->post_password = $post_password;
      $cur->post_lang = $post_lang;
@@ -316 +303 @@
      if ($post_id) {
           try {
-            $meta = $core->meta;
-            $meta->delPostMeta($post_id,'editor');
-            $meta->setPostMeta($post_id,'editor',$post_editor);
-
                # --BEHAVIOR-- adminBeforePostUpdate
                $core->callBehavior('adminBeforePostUpdate',$cur,$post_id);
@@ -343 +326 @@
 
                $return_id = $core->blog->addPost($cur);
-
-            $meta = $core->meta;
-            $meta->delPostMeta($return_id,'editor');
-            $meta->setPostMeta($return_id,'editor',$post_editor);
 
                # --BEHAVIOR-- adminAfterPostCreate
@@ -483 +462 @@
 if ($can_edit_post) {
      if (count($formaters_combo)>0 && ($core->auth->getOption('editor') && $core->auth->getOption('editor')!='')) {
-          // temporay removed until we can switch easily editor
-        // $post_format_field = form::combo('post_format',$formaters_combo,"$post_editor:$post_format",'maximal');
-
-        $post_format_field = sprintf('%s (%s)', $post_format, $post_editor);
-          $post_format_field .= form::hidden('post_format',"$post_editor:$post_format");
+        $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.'),