Merge "jquery.suggestions: Use document width instead of <body> width for position...

[lhc/web/wiklou.git] / includes / context / DerivativeContext.php
diff --git a/includes/context/DerivativeContext.php b/includes/context/DerivativeContext.php

index b9a7006..d4caf05 100644 (file)
--- a/includes/context/DerivativeContext.php
+++ b/includes/context/DerivativeContext.php
@@ -209,7 +209,7 @@ class DerivativeContext extends ContextSource {
         /**
          * Set the Language object
          *
-        * @deprecated 1.19 Use setLanguage instead
+        * @deprecated since 1.19 Use setLanguage instead
          * @param Language|string $l Language instance or language code
          */
         public function setLang( $l ) {
@@ -237,7 +237,7 @@ class DerivativeContext extends ContextSource {
         }
  
         /**
-        * @deprecated 1.19 Use getLanguage instead
+        * @deprecated since 1.19 Use getLanguage instead
          * @return Language
          */
         public function getLang() {
@@ -281,4 +281,20 @@ class DerivativeContext extends ContextSource {
                         return $this->getContext()->getSkin();
                 }
         }
+
+       /**
+        * Get a message using the current context.
+        *
+        * This can't just inherit from ContextSource, since then
+        * it would set only the original context, and not take
+        * into account any changes.
+        *
+        * @param String Message name
+        * @param Variable number of message arguments
+        * @return Message
+        */
+       public function msg() {
+               $args = func_get_args();
+               return call_user_func_array( 'wfMessage', $args )->setContext( $this );
+       }
  }