From caaf5a2d78d613573c7cbe8cfa6d68ff9fea21ff Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 29 Apr 2013 23:31:23 +0200
Subject: [PATCH] Fixed BBCodeParser config API usage

---
 parsers/BBCodeParser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parsers/BBCodeParser.php b/parsers/BBCodeParser.php
index e77299b60..203d0159b 100644
--- a/parsers/BBCodeParser.php
+++ b/parsers/BBCodeParser.php
@@ -182,7 +182,7 @@ class BBCodeParser extends TextParser {
 		$this->content = preg_replace("/\n\s*\n/", "</p><p>", $this->content);
 		$this->content = str_replace("\n", "<br />", $this->content);
 				
-		if(BBCodeParser::smiliesAllowed()) {
+		if($this->config()->allow_smilies) {
 			$smilies = array(
 				'#(?<!\w):D(?!\w)#i'         => " <img src='".BBCodeParser::smilies_location(). "/grin.gif'> ", // :D
 				'#(?<!\w):\)(?!\w)#i'        => " <img src='".BBCodeParser::smilies_location(). "/smile.gif'> ", // :)