dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Call wfThumbIncrAttemptFailures() in thumb.php on fatals"
[lhc/web/wiklou.git]
/
includes
/
Article.php
diff --git
a/includes/Article.php
b/includes/Article.php
index
d45b332
..
5ebeb60
100644
(file)
--- a/
includes/Article.php
+++ b/
includes/Article.php
@@
-238,7
+238,7
@@
class Article implements Page {
* This function has side effects! Do not use this function if you
* only want the real revision text if any.
*
* This function has side effects! Do not use this function if you
* only want the real revision text if any.
*
- * @deprecated
in
1.21; use WikiPage::getContent() instead
+ * @deprecated
since
1.21; use WikiPage::getContent() instead
*
* @return string Return the text of this revision
*/
*
* @return string Return the text of this revision
*/
@@
-355,7
+355,7
@@
class Article implements Page {
/**
* Load the revision (including text) into this object
*
/**
* Load the revision (including text) into this object
*
- * @deprecated
in
1.19; use fetchContent()
+ * @deprecated
since
1.19; use fetchContent()
*/
function loadContent() {
wfDeprecated( __METHOD__, '1.19' );
*/
function loadContent() {
wfDeprecated( __METHOD__, '1.19' );
@@
-374,7
+374,7
@@
class Article implements Page {
* has to remain public for now.
*
* @return mixed string containing article contents, or false if null
* has to remain public for now.
*
* @return mixed string containing article contents, or false if null
- * @deprecated
in
1.21, use WikiPage::getContent() instead
+ * @deprecated
since
1.21, use WikiPage::getContent() instead
*/
function fetchContent() { #BC cruft!
ContentHandler::deprecated( __METHOD__, '1.21' );
*/
function fetchContent() { #BC cruft!
ContentHandler::deprecated( __METHOD__, '1.21' );
@@
-1528,6
+1528,7
@@
class Article implements Page {
*/
public function render() {
$this->getContext()->getOutput()->setArticleBodyOnly( true );
*/
public function render() {
$this->getContext()->getOutput()->setArticleBodyOnly( true );
+ $this->getContext()->getOutput()->enableSectionEditLinks( false );
$this->view();
}
$this->view();
}