Bug 70196: Add categories added directly from extensions

Some extensions such as parser functions add categories directly
to the page rathen than as wikitext links. This patch gets them
from action=expandtemplates or action=parse and adds them to the
expanded content.

Change-Id: I1acdb14044badd767a46e81ef246a1c8de2419ce

lib/mediawiki.ApiRequest.js

@@ -365,7 +365,7 @@ function PreprocessorRequest( env, title, text ) {
 	var apiargs = {
 		format: 'json',
 		action: 'expandtemplates',
-		prop: 'wikitext',
+		prop: 'wikitext|categories',
 		text: text
 	};
 
@@ -426,6 +426,18 @@ PreprocessorRequest.prototype._handleJSON = function ( error, data ) {
 
 		// Add the source to the cache
 		this.env.pageCache[this.text] = src;
+
+		// Add the categories which were added by extensions
+		if (data.expandtemplates.categories) {
+			for (var i in data.expandtemplates.categories) {
+				var category = data.expandtemplates.categories[i];
+				src += '\n[[Category:' + category['*'];
+				if (category.sortkey) {
+					src += "|" + category.sortkey;
+				}
+				src += ']]';
+			}
+		}
 	} catch ( e2 ) {
 		error = new DoesNotExistError( 'Did not find page revisions in the returned body for ' +
 				this.title + e2 );
@@ -461,7 +473,7 @@ function PHPParseRequest ( env, name, text ) {
 		text: text,
 		disablepp: 'true',
 		contentmodel: 'wikitext',
-		prop: 'text|modules'
+		prop: 'text|modules|categories'
 	};
 	var uri = env.conf.wiki.apiURI;
 
@@ -549,6 +561,23 @@ PHPParseRequest.prototype._handleJSON = function ( error, data ) {
 			}
 			for (i in data.parse.modulemessages) { this.env.page.extensionModuleMessages.add(data.parse.modulemessages[i]); }
 		}
+
+		// Add the categories which were added by extensions
+		if (data.parse.categories) {
+			for (i in data.parse.categories) {
+				var category = data.parse.categories[i];
+				// Only add those categories given as hidden by the parser, the
+				// rest will be already included in the parser output.
+				if (category.hidden !== undefined) {
+					parsedHtml += '\n<link rel="mw:PageProp/Category" href="./Category:"' +
+						category['*'];
+					if (category.sortkey) {
+						parsedHtml += "#" + category.sortkey;
+					}
+					parsedHtml += '"/>';
+				}
+			}
+		}
 	} catch ( e2 ) {
 		error = new DoesNotExistError( 'Could not expand extension content for ' +
 				this.title + e2 );