From e830370858d0ff2e5a72151e339c71ab8929f92b Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 14 Jul 2011 20:38:28 +0000
Subject: [PATCH] Kill AjaxFunctions.php. The only thing using this was
 FCKEditor, so I moved js_unescape() over to it. Roan: "So what does it do?"
 Me: "Converts stuff encoded with JS's escape() back into a normal string,
 according to the docs." Roan: "That sounds like a workaround for bad design"

---
 RELEASE-NOTES-1.19          |  2 ++
 includes/AjaxDispatcher.php |  6 ----
 includes/AjaxFunctions.php  | 58 -------------------------------------
 includes/AjaxResponse.php   |  4 ---
 4 files changed, 2 insertions(+), 68 deletions(-)
 delete mode 100644 includes/AjaxFunctions.php

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 371d38325d..55a61f464d 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -168,6 +168,8 @@ production.
 * (bug 29737) "MediaWiki:Qbsettings-directionality" should refer to script,
   not language.
 * (bug 26360) $wgSessionHandler was overriding system settings unconditionally.
+* Removed AjaxFunctions.php. The last remaining function js_unescape() was moved
+  to the FCKEditor extension.
 
 === API changes in 1.19 ===
 * BREAKING CHANGE: action=watch now requires POST and token.
diff --git a/includes/AjaxDispatcher.php b/includes/AjaxDispatcher.php
index 0f1d74b598..17b154d61f 100644
--- a/includes/AjaxDispatcher.php
+++ b/includes/AjaxDispatcher.php
@@ -7,12 +7,6 @@
  * Handle ajax requests and send them to the proper handler.
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-	die( 1 );
-}
-
-require_once( 'AjaxFunctions.php' );
-
 /**
  * Object-Oriented Ajax functions.
  * @ingroup Ajax
diff --git a/includes/AjaxFunctions.php b/includes/AjaxFunctions.php
deleted file mode 100644
index d3173e4edc..0000000000
--- a/includes/AjaxFunctions.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Handler functions for Ajax requests
- *
- * @file
- * @ingroup Ajax
- */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-	die( 1 );
-}
-
-/**
- * Function converts an Javascript escaped string back into a string with
- * specified charset (default is UTF-8).
- * Modified function from http://pure-essence.net/stuff/code/utf8RawUrlDecode.phps
- *
- * @param $source String escaped with Javascript's escape() function
- * @param $iconv_to String destination character set will be used as second parameter
- * in the iconv function. Default is UTF-8.
- * @return string
- */
-function js_unescape( $source, $iconv_to = 'UTF-8' ) {
-	$decodedStr = '';
-	$pos = 0;
-	$len = strlen ( $source );
-
-	while ( $pos < $len ) {
-		$charAt = substr ( $source, $pos, 1 );
-		if ( $charAt == '%' ) {
-			$pos++;
-			$charAt = substr ( $source, $pos, 1 );
-
-			if ( $charAt == 'u' ) {
-				// we got a unicode character
-				$pos++;
-				$unicodeHexVal = substr ( $source, $pos, 4 );
-				$unicode = hexdec ( $unicodeHexVal );
-				$decodedStr .= codepointToUtf8( $unicode );
-				$pos += 4;
-			} else {
-				// we have an escaped ascii character
-				$hexVal = substr ( $source, $pos, 2 );
-				$decodedStr .= chr ( hexdec ( $hexVal ) );
-				$pos += 2;
-			}
-		} else {
-			$decodedStr .= $charAt;
-			$pos++;
-		}
-	}
-
-	if ( $iconv_to != "UTF-8" ) {
-		$decodedStr = iconv( "utf-8", $iconv_to, $decodedStr );
-	}
-
-	return $decodedStr;
-}
diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index 014798f81a..b9f8085557 100644
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -6,10 +6,6 @@
  * @ingroup Ajax
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-	die( 1 );
-}
-
 /**
  * Handle responses for Ajax requests (send headers, print
  * content, that sort of thing)
-- 
2.20.1