From 23766bee10efb4441212105a6de7a1dd5a4139a9 Mon Sep 17 00:00:00 2001
From: Florian <florian.schmidt.welzow@t-online.de>
Date: Thu, 21 May 2015 19:02:34 +0200
Subject: [PATCH] Move MathCaptcha to it's own place

3a. step before using ExtensionRegistration.

Bug: T88047
Change-Id: I809f1105ce3c7f5a6a2be7ebc6565c5187b7a76d
---
 FancyCaptcha/FancyCaptcha.php                 |  2 +-
 MathCaptcha.php                               | 21 +------------------
 .../MathCaptcha.class.php                     |  0
 MathCaptcha/MathCaptcha.php                   | 21 +++++++++++++++++++
 4 files changed, 23 insertions(+), 21 deletions(-)
 rename MathCaptcha.class.php => MathCaptcha/MathCaptcha.class.php (100%)
 create mode 100644 MathCaptcha/MathCaptcha.php

diff --git a/FancyCaptcha/FancyCaptcha.php b/FancyCaptcha/FancyCaptcha.php
index 403d23c7a..3d22329e2 100644
--- a/FancyCaptcha/FancyCaptcha.php
+++ b/FancyCaptcha/FancyCaptcha.php
@@ -29,7 +29,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 	exit;
 }
 
-require_once __DIR__ . '/../ConfirmEdit.php';
+require_once dirname( __DIR__ ) . '/ConfirmEdit.php';
 $wgCaptchaClass = 'FancyCaptcha';
 
 /**
diff --git a/MathCaptcha.php b/MathCaptcha.php
index 7bfb493f2..dd34d53ec 100644
--- a/MathCaptcha.php
+++ b/MathCaptcha.php
@@ -1,21 +1,2 @@
 <?php
-
-/**
- * Captcha class using simple sums and the math renderer
- * Not brilliant, but enough to dissuade casual spam bots
- *
- * @file
- * @ingroup Extensions
- * @author Rob Church <robchur@gmail.com>
- * @copyright © 2006 Rob Church
- * @licence GNU General Public Licence 2.0
- */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-	exit;
-}
-
-require_once __DIR__ . '/ConfirmEdit.php';
-$wgCaptchaClass = 'MathCaptcha';
-
-$wgAutoloadClasses['MathCaptcha'] = __DIR__ . '/MathCaptcha.class.php';
+require_once __DIR__ . "/MathCaptcha/MathCaptcha.php";
diff --git a/MathCaptcha.class.php b/MathCaptcha/MathCaptcha.class.php
similarity index 100%
rename from MathCaptcha.class.php
rename to MathCaptcha/MathCaptcha.class.php
diff --git a/MathCaptcha/MathCaptcha.php b/MathCaptcha/MathCaptcha.php
new file mode 100644
index 000000000..fa0cd15f7
--- /dev/null
+++ b/MathCaptcha/MathCaptcha.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Captcha class using simple sums and the math renderer
+ * Not brilliant, but enough to dissuade casual spam bots
+ *
+ * @file
+ * @ingroup Extensions
+ * @author Rob Church <robchur@gmail.com>
+ * @copyright © 2006 Rob Church
+ * @licence GNU General Public Licence 2.0
+ */
+
+if ( !defined( 'MEDIAWIKI' ) ) {
+	exit;
+}
+
+require_once dirname( __DIR__ ) . '/ConfirmEdit.php';
+$wgCaptchaClass = 'MathCaptcha';
+
+$wgAutoloadClasses['MathCaptcha'] = __DIR__ . '/MathCaptcha.class.php';