Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 27 insertions, 0 deletions

diff --git a/resources/src/mediawiki/mediawiki.notify.js b/resources/src/mediawiki/mediawiki.notify.js
new file mode 100644
index 00000000..c1e1dabf
--- /dev/null
+++ b/resources/src/mediawiki/mediawiki.notify.js
@@ -0,0 +1,27 @@
+/**
+ * @class mw.plugin.notify
+ */
+( function ( mw ) {
+	'use strict';
+
+	/**
+	 * @see mw.notification#notify
+	 * @param message
+	 * @param options
+	 * @return {jQuery.Promise}
+	 */
+	mw.notify = function ( message, options ) {
+		// Don't bother loading the whole notification system if we never use it.
+		return mw.loader.using( 'mediawiki.notification' )
+			.then( function () {
+				// Call notify with the notification the user requested of us.
+				return mw.notification.notify( message, options );
+			} );
+	};
+
+	/**
+	 * @class mw
+	 * @mixins mw.plugin.notify
+	 */
+
+}( mediaWiki ) );