dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f93810d
506456c
)
Merge "Added docu headers to content(handler) files"
author
IAlex
<ialex.wiki@gmail.com>
Wed, 17 Oct 2012 16:16:23 +0000
(16:16 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Wed, 17 Oct 2012 16:16:23 +0000
(16:16 +0000)
1
2
includes/content/AbstractContent.php
patch
|
diff1
|
diff2
|
blob
|
history
includes/content/Content.php
patch
|
diff1
|
diff2
|
blob
|
history
includes/content/ContentHandler.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
includes/content/AbstractContent.php
index
488c4be
,
1a730bc
..
495711a
---
1
/
includes/content/AbstractContent.php
---
2
/
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
1745ae2
,
3ef73db
..
d830dc7
---
1
/
includes/content/Content.php
---
2
/
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
--}
++}
diff --cc
includes/content/ContentHandler.php
Simple merge