[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove ContentHandler functions with no usages at all

2016-12-03 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove ContentHandler functions with no usages at all
..


Remove ContentHandler functions with no usages at all

Bug: T145728
Change-Id: Ia0d7a5eb7e79b586c3b30688c80bb8b4b723fff6
---
M RELEASE-NOTES-1.29
M includes/page/Article.php
2 files changed, 2 insertions(+), 19 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  TTO: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 98d2a17..caa35ef 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -60,6 +60,8 @@
   Status return type is deprecated.
 * User::edits() (deprecated in 1.21) was removed.
 * Xml::escapeJsString() (deprecated in 1.21) was removed.
+* Article::getText() and Article::prepareTextForEdit() (deprecated in 1.21)
+  were removed.
 
 == Compatibility ==
 
diff --git a/includes/page/Article.php b/includes/page/Article.php
index 9a2a8e2..ac363b2 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -2333,16 +2333,6 @@
 
/**
 * Call to WikiPage function for backwards compatibility.
-* @see WikiPage::getText
-* @deprecated since 1.21 use WikiPage::getContent() instead
-*/
-   public function getText( $audience = Revision::FOR_PUBLIC, User $user = 
null ) {
-   wfDeprecated( __METHOD__, '1.21' );
-   return $this->mPage->getText( $audience, $user );
-   }
-
-   /**
-* Call to WikiPage function for backwards compatibility.
 * @see WikiPage::getTimestamp
 */
public function getTimestamp() {
@@ -2501,15 +2491,6 @@
$content, $revision, $user,
$serialFormat, $useCache
);
-   }
-
-   /**
-* Call to WikiPage function for backwards compatibility.
-* @deprecated since 1.21, use prepareContentForEdit
-* @see WikiPage::prepareTextForEdit
-*/
-   public function prepareTextForEdit( $text, $revid = null, User $user = 
null ) {
-   return $this->mPage->prepareTextForEdit( $text, $revid, $user );
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/324703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0d7a5eb7e79b586c3b30688c80bb8b4b723fff6
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove ContentHandler functions with no usages at all

2016-12-01 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/324703

Change subject: Remove ContentHandler functions with no usages at all
..

Remove ContentHandler functions with no usages at all

Bug: T145728
Change-Id: Ia0d7a5eb7e79b586c3b30688c80bb8b4b723fff6
---
M includes/import/WikiRevision.php
M includes/page/Article.php
2 files changed, 0 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/03/324703/1

diff --git a/includes/import/WikiRevision.php b/includes/import/WikiRevision.php
index 1e866f3..0384c2f 100644
--- a/includes/import/WikiRevision.php
+++ b/includes/import/WikiRevision.php
@@ -314,17 +314,6 @@
}
 
/**
-* @return string
-*
-* @deprecated Since 1.21, use getContent() instead.
-*/
-   function getText() {
-   wfDeprecated( __METHOD__, '1.21' );
-
-   return $this->text;
-   }
-
-   /**
 * @return ContentHandler
 */
function getContentHandler() {
diff --git a/includes/page/Article.php b/includes/page/Article.php
index 9a2a8e2..ac363b2 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -2333,16 +2333,6 @@
 
/**
 * Call to WikiPage function for backwards compatibility.
-* @see WikiPage::getText
-* @deprecated since 1.21 use WikiPage::getContent() instead
-*/
-   public function getText( $audience = Revision::FOR_PUBLIC, User $user = 
null ) {
-   wfDeprecated( __METHOD__, '1.21' );
-   return $this->mPage->getText( $audience, $user );
-   }
-
-   /**
-* Call to WikiPage function for backwards compatibility.
 * @see WikiPage::getTimestamp
 */
public function getTimestamp() {
@@ -2501,15 +2491,6 @@
$content, $revision, $user,
$serialFormat, $useCache
);
-   }
-
-   /**
-* Call to WikiPage function for backwards compatibility.
-* @deprecated since 1.21, use prepareContentForEdit
-* @see WikiPage::prepareTextForEdit
-*/
-   public function prepareTextForEdit( $text, $revid = null, User $user = 
null ) {
-   return $this->mPage->prepareTextForEdit( $text, $revid, $user );
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/324703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0d7a5eb7e79b586c3b30688c80bb8b4b723fff6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits