Update to MediaWiki 1.25.1

1 files changed, 1 insertions, 87 deletions

diff --git a/extensions/ConfirmEdit/FancyCaptcha.php b/extensions/ConfirmEdit/FancyCaptcha.php
index 2082e604..5d5da32d 100644
--- a/extensions/ConfirmEdit/FancyCaptcha.php
+++ b/extensions/ConfirmEdit/FancyCaptcha.php
@@ -1,88 +1,2 @@
 <?php
-/**
- * Experimental image-based captcha plugin, using images generated by an
- * external tool.
- *
- * Copyright (C) 2005, 2006 Brion Vibber <brion@pobox.com>
- * http://www.mediawiki.org/
- *
- * 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
- * @ingroup Extensions
- */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-	exit;
-}
-
-$dir = __DIR__;
-require_once $dir . '/ConfirmEdit.php';
-$wgCaptchaClass = 'FancyCaptcha';
-
-/**
- * The name of a file backend ($wgFileBackends) to be used for storing files.
- * Defaults to FSFileBackend using $wgCaptchaDirectory as a base path.
- */
-$wgCaptchaFileBackend = '';
-
-global $wgCaptchaDirectory;
-$wgCaptchaDirectory = "$wgUploadDirectory/captcha"; // bad default :D
-
-global $wgCaptchaDirectoryLevels;
-$wgCaptchaDirectoryLevels = 0; // To break into subdirectories
-
-global $wgCaptchaSecret;
-$wgCaptchaSecret = "CHANGE_THIS_SECRET!";
-
-/**
- * By default the FancyCaptcha rotates among all available captchas.
- * Setting $wgCaptchaDeleteOnSolve to true will delete the captcha
- * files when they are correctly solved. Thus the user will need
- * something like a cron creating new thumbnails to avoid drying up.
- */
-$wgCaptchaDeleteOnSolve = false;
-
-$wgMessagesDirs['FancyCaptcha'] = __DIR__ . '/i18n/fancy';
-$wgExtensionMessagesFiles['FancyCaptcha'] = $dir . '/FancyCaptcha.i18n.php';
-$wgAutoloadClasses['FancyCaptcha'] = $dir . '/FancyCaptcha.class.php';
-
-$wgResourceModules['ext.confirmEdit.fancyCaptcha.styles'] = array(
-	'localBasePath' => $dir . '/resources',
-	'remoteExtPath' => 'ConfirmEdit/resources',
-	'targets' => array( 'mobile', 'desktop' ),
-	'styles' => 'ext.confirmEdit.fancyCaptcha.css',
-);
-
-$wgResourceModules['ext.confirmEdit.fancyCaptcha'] = array(
-	'localBasePath' => $dir . '/resources',
-	'remoteExtPath' => 'ConfirmEdit/resources',
-	'scripts' => 'ext.confirmEdit.fancyCaptcha.js',
-	'dependencies' => 'mediawiki.api',
-);
-
-// FIXME: remove, add mobile target to ext.confirmEdit.fancyCaptcha and update
-// MobileFrontend accordingly when bug 57629 is resolved
-$wgResourceModules['ext.confirmEdit.fancyCaptchaMobile'] = array(
-	'localBasePath' => $dir . '/resources',
-	'remoteExtPath' => 'ConfirmEdit/resources',
-	'scripts' => 'ext.confirmEdit.fancyCaptcha.js',
-	'targets' => array( 'mobile', 'desktop' ),
-	'dependencies' => 'mobile.startup',
-);
-
-$wgAutoloadClasses['ApiFancyCaptchaReload'] = $dir . '/ApiFancyCaptchaReload.php';
-$wgAPIModules['fancycaptchareload'] = 'ApiFancyCaptchaReload';
+require_once __DIR__ . "/FancyCaptcha/FancyCaptcha.php";