r107979 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r107978‎ | r107979 | r107980 >
Date:01:07, 4 January 2012
Author:reedy
Status:ok
Tags:
Comment:
"Merge" r107978
Modified paths:
  • /branches/REL1_18/phase3/includes/RequestContext.php (modified) (history)
  • /branches/REL1_18/phase3/includes/SpecialPage.php (modified) (history)

Diff [purge]

Index: branches/REL1_18/phase3/includes/RequestContext.php
@@ -65,6 +65,13 @@
6666 public function getLang();
6767
6868 /**
 69+ * Get the Language object
 70+ *
 71+ * @return Language
 72+ */
 73+ public function getLanguage();
 74+
 75+ /**
6976 * Get the Skin object
7077 *
7178 * @return Skin
@@ -234,6 +241,15 @@
235242 }
236243
237244 /**
 245+ * Get the Language object
 246+ *
 247+ * @return Language
 248+ */
 249+ public function getLanguage() {
 250+ return $this->getLang();
 251+ }
 252+
 253+ /**
238254 * Set the Skin object
239255 *
240256 * @param $s Skin
@@ -379,6 +395,15 @@
380396 }
381397
382398 /**
 399+ * Get the Language object
 400+ *
 401+ * @return Language
 402+ */
 403+ public function getLanguage() {
 404+ return $this->getContext()->getLang();
 405+ }
 406+
 407+ /**
383408 * Get the Skin object
384409 *
385410 * @return Skin
Index: branches/REL1_18/phase3/includes/SpecialPage.php
@@ -671,19 +671,18 @@
672672 * Shortcut to get user's language
673673 *
674674 * @return Language
675 - * @since 1.18.1
 675+ * @since 1.18
676676 */
677 - public function getLanguage() {
678 - return $this->getContext()->getLanguage();
 677+ public function getLang() {
 678+ return $this->getContext()->getLang();
679679 }
680680
681681 /**
682682 * Shortcut to get user's language
683683 *
684684 * @return Language
685 - * @since 1.18
686685 */
687 - public function getLang() {
 686+ public function getLanguage() {
688687 return $this->getContext()->getLang();
689688 }
690689

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r107978Fix undefined call to context()->getLang()...reedy01:03, 4 January 2012

Status & tagging log