From 14f74d141ab5580688bfd46d2f74c026e43ed967 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 1 Apr 2015 06:11:44 +0200
Subject: Update to MediaWiki 1.24.2

---
 maintenance/jsduck/config.json  | 40 ----------------------------------------
 maintenance/mwjsduck-gen        | 25 ++-----------------------
 maintenance/postgres/tables.sql |  2 +-
 3 files changed, 3 insertions(+), 64 deletions(-)
 delete mode 100644 maintenance/jsduck/config.json

(limited to 'maintenance')

diff --git a/maintenance/jsduck/config.json b/maintenance/jsduck/config.json
deleted file mode 100644
index e97f2923..00000000
--- a/maintenance/jsduck/config.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"--title": "MediaWiki core - Documentation",
-	"--categories": "./categories.json",
-	"--eg-iframe": "./eg-iframe.html",
-	"--tags": "./CustomTags.rb",
-	"--warnings": ["-nodoc(class,public)"],
-	"--builtin-classes": true,
-	"--warnings-exit-nonzero": true,
-	"--external": "HTMLElement,HTMLDocument,Window,File",
-	"--footer": "Documentation for MediaWiki core. Generated on {DATE} by {JSDUCK} {VERSION}.",
-	"--output": "../../docs/js",
-	"--": [
-		"./external.js",
-		"../../resources/src/mediawiki",
-		"../../resources/src/mediawiki.action",
-		"../../resources/src/mediawiki.api",
-		"../../resources/src/mediawiki.language",
-		"../../resources/src/mediawiki.page",
-		"../../resources/src/mediawiki.special",
-		"../../resources/src/jquery/jquery.accessKeyLabel.js",
-		"../../resources/src/jquery/jquery.arrowSteps.js",
-		"../../resources/src/jquery/jquery.autoEllipsis.js",
-		"../../resources/src/jquery/jquery.badge.js",
-		"../../resources/src/jquery/jquery.byteLength.js",
-		"../../resources/src/jquery/jquery.byteLimit.js",
-		"../../resources/src/jquery/jquery.checkboxShiftClick.js",
-		"../../resources/src/jquery/jquery.client.js",
-		"../../resources/src/jquery/jquery.colorUtil.js",
-		"../../resources/src/jquery/jquery.confirmable.js",
-		"../../resources/src/jquery/jquery.footHovzer.js",
-		"../../resources/src/jquery/jquery.getAttrs.js",
-		"../../resources/src/jquery/jquery.hidpi.js",
-		"../../resources/src/jquery/jquery.localize.js",
-		"../../resources/src/jquery/jquery.makeCollapsible.js",
-		"../../resources/src/jquery/jquery.spinner.js",
-		"../../resources/src/jquery/jquery.tabIndex.js",
-		"../../resources/lib/oojs",
-		"../../resources/lib/oojs-ui"
-	]
-}
diff --git a/maintenance/mwjsduck-gen b/maintenance/mwjsduck-gen
index 5247637b..6b7c77b6 100644
--- a/maintenance/mwjsduck-gen
+++ b/maintenance/mwjsduck-gen
@@ -1,25 +1,4 @@
 #!/usr/bin/env bash
 set -e
-
-JSDUCK_MWVERSION=master
-if [[ "$1" == "--version" && "$2" != "" ]]
-then
-	JSDUCK_MWVERSION="$2"
-elif [[ "$*" != "" ]]
-then
-	FILENAME=$(basename $0)
-	echo "Usage: $FILENAME [--version <mediawiki version>]"
-	echo
-	exit 1
-fi
-
-MWCORE_DIR=$(cd $(dirname $0)/..; pwd)
-
-jsduck \
---config=$MWCORE_DIR/maintenance/jsduck/config.json \
---footer="Documentation for branch ($JSDUCK_MWVERSION) on {DATE} by {JSDUCK} {VERSION}." \
---processes 0
-
-echo 'JSDuck execution finished.'
-
-ln -s ../../resources $MWCORE_DIR/docs/js/modules
+cd $(dirname $0)/..
+jsduck
diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index 400050e7..12e357fc 100644
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -421,7 +421,7 @@ CREATE TABLE recentchanges (
   rc_minor           SMALLINT     NOT NULL  DEFAULT 0,
   rc_bot             SMALLINT     NOT NULL  DEFAULT 0,
   rc_new             SMALLINT     NOT NULL  DEFAULT 0,
-  rc_cur_id          INTEGER          NULL  REFERENCES page(page_id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
+  rc_cur_id          INTEGER          NULL,
   rc_this_oldid      INTEGER      NOT NULL,
   rc_last_oldid      INTEGER      NOT NULL,
   rc_type            SMALLINT     NOT NULL  DEFAULT 0,
-- 
cgit v1.2.2