From 0511982426e319e90b6bd03c9eae775ddfaad622 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Mon, 8 Jun 2015 15:04:22 +0930
Subject: [PATCH] Update for new formatting API.

---
 .../mentions/src/PostMentionsFormatter.php    | 24 ++++++++-----------
 .../mentions/src/UserMentionsFormatter.php    | 15 ++++++++----
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/extensions/mentions/src/PostMentionsFormatter.php b/extensions/mentions/src/PostMentionsFormatter.php
index f2c7e1bee..7d9c1ea30 100644
--- a/extensions/mentions/src/PostMentionsFormatter.php
+++ b/extensions/mentions/src/PostMentionsFormatter.php
@@ -1,6 +1,9 @@
 <?php namespace Flarum\Mentions;
 
-class PostMentionsFormatter
+use Flarum\Core\Formatter\FormatterAbstract;
+use Flarum\Core\Models\Post;
+
+class PostMentionsFormatter extends FormatterAbstract
 {
     protected $parser;
 
@@ -9,23 +12,16 @@ class PostMentionsFormatter
         $this->parser = $parser;
     }
 
-    public function format($text, $post = null)
+    public function afterPurification($text, Post $post = null)
     {
         if ($post) {
-            $text = $this->parser->replace($text, function ($match) use ($post) {
-                return '<a href="#/d/'.$post->discussion_id.'/-/'.$match['number'].'" class="mention-post" data-number="'.$match['number'].'">'.$match['username'].'</a>';
-            }, $text);
+            $text = $this->ignoreTags($text, ['a', 'code', 'pre'], function ($text) use ($post) {
+                return $this->parser->replace($text, function ($match) use ($post) {
+                    return '<a href="#/d/'.$post->discussion_id.'/-/'.$match['number'].'" class="mention-post" data-number="'.$match['number'].'">'.$match['username'].'</a>';
+                }, $text);
+            });
         }
 
         return $text;
     }
-
-    public function strip($text)
-    {
-        $text = $this->parser->replace($text, function () {
-            return ' ';
-        });
-
-        return $text;
-    }
 }
diff --git a/extensions/mentions/src/UserMentionsFormatter.php b/extensions/mentions/src/UserMentionsFormatter.php
index 9e2598373..9a9c6d275 100644
--- a/extensions/mentions/src/UserMentionsFormatter.php
+++ b/extensions/mentions/src/UserMentionsFormatter.php
@@ -1,6 +1,9 @@
 <?php namespace Flarum\Mentions;
 
-class UserMentionsFormatter
+use Flarum\Core\Formatter\FormatterAbstract;
+use Flarum\Core\Models\Post;
+
+class UserMentionsFormatter extends FormatterAbstract
 {
     protected $parser;
 
@@ -9,11 +12,13 @@ class UserMentionsFormatter
         $this->parser = $parser;
     }
 
-    public function format($text, $post = null)
+    public function afterPurification($text, Post $post = null)
     {
-        $text = $this->parser->replace($text, function ($match) {
-            return '<a href="#/u/'.$match['username'].'" class="mention-user" data-user="'.$match['username'].'">'.$match['username'].'</a>';
-        }, $text);
+        $text = $this->ignoreTags($text, ['a', 'code', 'pre'], function ($text) {
+            return $this->parser->replace($text, function ($match) {
+                return '<a href="#/u/'.$match['username'].'" class="mention-user" data-user="'.$match['username'].'">'.$match['username'].'</a>';
+            }, $text);
+        });
 
         return $text;
     }