From: IAlex <ialex.wiki@gmail.com>
Date: Wed, 17 Oct 2012 16:16:23 +0000 (+0000)
Subject: Merge "Added docu headers to content(handler) files"
X-Git-Tag: 1.31.0-rc.0~21985
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=a1f1af711939946187ba645d15c2ce8e17a5a0da;p=lhc%2Fweb%2Fwiklou.git

Merge "Added docu headers to content(handler) files"
---

a1f1af711939946187ba645d15c2ce8e17a5a0da
diff --cc includes/content/AbstractContent.php
index 488c4beec3,1a730bc47e..495711ab05
--- a/includes/content/AbstractContent.php
+++ b/includes/content/AbstractContent.php
@@@ -391,4 -343,4 +411,4 @@@ abstract class AbstractContent implemen
  	public function matchMagicWord( MagicWord $word ) {
  		return false;
  	}
--}
++}
diff --cc includes/content/Content.php
index 1745ae22f3,3ef73db6ac..d830dc7dc2
--- a/includes/content/Content.php
+++ b/includes/content/Content.php
@@@ -467,4 -483,4 +487,4 @@@ interface Content 
  	#   [11:59] <vvv> Hooks are ugly; make CodeHighlighter interface and a
  	#   config to set the class which handles syntax highlighting
  	#   [12:00] <vvv> And default it to a DummyHighlighter
--}
++}