Changeset 633701

Timestamp:

12/03/2012 11:09:08 PM (12 years ago)

Author:

stephenh1988

Message:

Removes unautop and autop methods: use embed shortcodes for oembed. Remove tinymce editor if using MD. Adds public wrapper functions

Location:

wp-markdown/trunk

Files:

• markdownify/markdownify.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• wp-markdown.php (modified) (9 diffs)

wp-markdown/trunk/markdownify/markdownify.php

@@ -903 +903 @@
    */
   function handleTag_br() {
-    $this->out("  \n".$this->indent, true);
+    //$this->out("  \n".$this->indent, true);
+    $this->out("<br>",true);
     $this->parser->html = ltrim($this->parser->html);
   }

wp-markdown/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.1
 Tested up to: 3.4.1
-Stable tag: 1.1.5
+Stable tag: 1.1.
 
 Allows Markdown to be enabled in posts, comments and bbPress forums. 
@@ -49 +49 @@
 == Changelog ==
 
+
+
+
+
+
+
+
 = 1.1.5 =
+
 * Fixes bug introduced in 1.1.4 where line breaks are stripped (affects code blocks).
 
+
 = 1.1.4 =
+
 * Fixes bug where oembed would not work. Thanks ot Michael & Vinicius
 * Adds a filters for MarkDown 'help' text: `wpmarkdown_help_text`
 * Support for MarkDown extra (currently not supported in pagedown previewer)
 
+
 = 1.1.3 =
+
 * Stable with WordPress 3.4
 * Fixed bug relating title attributes for links and images
 
+
 = 1.1.2 =
+
 * Fixed bug relating to comments by logged out users
 
+
 = 1.1.1 =
+
 * Fixed backslash bug
 
+
 = 1.1 =
+
 * Added option to replace TinyMCE with Markdown help bar on post editor
 
+
 = 1.0 =
+
 * Initial release
 

wp-markdown/trunk/wp-markdown.php

@@ -3 +3 @@
 Plugin Name: WP-Markdown
 Description: Allows you to use MarkDown in posts, BBPress forums and comments
-Version: 1.1.5
+Version: 1.1.
 Author: Stephen Harris
 Author URI: http://HarrisWebSolutions.co.uk/blog
@@ -67 +67 @@
         add_filter('pre_comment_content',array($this,'pre_comment_content'),5);
         add_filter( 'wp_insert_post_data', array( $this, 'wp_insert_post_data' ), 10, 2 );
-        add_filter( 'wp_insert_post_data', array( $this, 'un_wpautop' ), 11, 2 );
 
         //Convert HTML to Markdown (posts, comments, BBPress front-end editing)
-        add_filter( 'edit_post_content', array( $this, 'wpautop' ), 10, 2 );
         add_filter( 'edit_post_content', array( $this, 'edit_post_content' ), 10, 2 );
         add_filter( 'comment_edit_pre',  array( $this, 'edit_comment_content' ));
@@ -243 +241 @@
     }
 
-    //Replace <p> tags that are added when converting  markdown --> HTML. 
-    //These are added back in when editing (see $this->wpautop)
-    //They remain stripped for displaying (so oembed works).
-    public function un_wpautop($data,$postarr){
-        if($this->is_Markdownable($data['post_type'])|| ($data['post_type'] =='revision' && $this->is_Markdownable($data['post_parent']))){
-            $s = $data['post_content'];
-
-            //remove all <p>
-            $s = str_replace("<p>", "", $s);
-
-            //replace <br /> with \n
-            $s = str_replace(array("<br />", "<br>", "<br/>"), "\n", $s);
-
-            //replace </p> with \n\n
-            $s = str_replace("</p>", "\n\n", $s);       
-
-            $data['post_content'] = $s;
-        }
-        return $data;      
-    }
 
 
@@ -268 +246 @@
     * Convert HTML to MarkDown for editing
     */
-    //Add <p> tags for markdown. These a replaced prior to saving to database. See $this->un_wpautop.
-    public function wpautop($content, $id){
-        if($this->is_Markdownable((int) $id)){
-            $content = wpautop($content);
-        }
-        return $content;
-    }
+
     //Post content
     public function edit_post_content( $content, $id ) {
@@ -318 +290 @@
     function pre_textarea_prettify_bbpress_reply(){
         if($this->is_Markdownable('reply')){
+
             echo self::pre_textarea_prettify('bbp_reply_content');
         }
@@ -323 +296 @@
     function post_textarea_prettify_bbpress_reply(){
         if($this->is_Markdownable('reply')){
+
             echo self::post_textarea_prettify('bbp_reply_content');
         }
@@ -328 +302 @@
     function pre_textarea_prettify_bbpress_topic(){
         if($this->is_Markdownable('topic')){
+
             echo self::pre_textarea_prettify('bbp_topic_content');
         }
@@ -333 +308 @@
     function post_textarea_prettify_bbpress_topic(){
         if($this->is_Markdownable('topic')){
+
             echo self::post_textarea_prettify('bbp_topic_content');
         }
@@ -432 +408 @@
 }
 
+
+
+
+
+
+
+
+
+
+
 require_once( dirname( __FILE__) . '/markdown-extra.php' );
 require_once( dirname( __FILE__) . '/markdownify/markdownify.php' );