Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing

1 files changed, 63 insertions, 0 deletions

diff --git a/includes/resourceloader/ResourceLoaderUserTokensModule.php b/includes/resourceloader/ResourceLoaderUserTokensModule.php
new file mode 100644
index 00000000..9403534c
--- /dev/null
+++ b/includes/resourceloader/ResourceLoaderUserTokensModule.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @author Krinkle
+ */
+
+/**
+ * Module for user tokens
+ */
+class ResourceLoaderUserTokensModule extends ResourceLoaderModule {
+
+	/* Protected Members */
+
+	protected $origin = self::ORIGIN_CORE_INDIVIDUAL;
+
+	/* Methods */
+
+	/**
+	 * Fetch the tokens for the current user.
+	 * 
+	 * @param $context ResourceLoaderContext: Context object
+	 * @return Array: List of tokens keyed by token type
+	 */
+	protected function contextUserTokens( ResourceLoaderContext $context ) {
+		global $wgUser;
+
+		return array(
+			'editToken' => $wgUser->edittoken(),
+			'watchToken' => ApiQueryInfo::getWatchToken(null, null),
+		);
+	}
+
+	/**
+	 * @param $context ResourceLoaderContext
+	 * @return string
+	 */
+	public function getScript( ResourceLoaderContext $context ) {
+		return Xml::encodeJsCall( 'mw.user.tokens.set', 
+			array( $this->contextUserTokens( $context ) ) );
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getGroup() {
+		return 'private';
+	}
+}