Localisation updates for core and extension messages from translatewiki.net (2011...

[lhc/web/wiklou.git] / includes / AjaxFunctions.php

diff --git a/includes/AjaxFunctions.php b/includes/AjaxFunctions.php
index 04572b4..d3173e4 100644 (file)
--- a/includes/AjaxFunctions.php
+++ b/includes/AjaxFunctions.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * Handler functions for Ajax requests
+ *
  * @file
  * @ingroup Ajax
  */
@@ -34,7 +36,7 @@ function js_unescape( $source, $iconv_to = 'UTF-8' ) {
                                $pos++;
                                $unicodeHexVal = substr ( $source, $pos, 4 );
                                $unicode = hexdec ( $unicodeHexVal );
-                               $decodedStr .= code2utf( $unicode );
+                               $decodedStr .= codepointToUtf8( $unicode );
                                $pos += 4;
                        } else {
                                // we have an escaped ascii character
@@ -49,51 +51,8 @@ function js_unescape( $source, $iconv_to = 'UTF-8' ) {
        }
 
        if ( $iconv_to != "UTF-8" ) {
-               $decodedStr = iconv( "UTF-8", $iconv_to, $decodedStr );
+               $decodedStr = iconv( "utf-8", $iconv_to, $decodedStr );
        }
 
        return $decodedStr;
 }
-
-/**
- * Function coverts number of utf char into that character.
- * Function taken from: http://www.php.net/manual/en/function.utf8-encode.php#49336
- *
- * @param $num Integer
- * @return utf8char
- */
-function code2utf( $num ) {
-       if ( $num < 128 ) {
-               return chr( $num );
-       }
-
-       if ( $num < 2048 ) {
-               return chr( ( $num >> 6 ) + 192 ) . chr( ( $num&63 ) + 128 );
-       }
-
-       if ( $num < 65536 ) {
-               return chr( ( $num >> 12 ) + 224 ) . chr( ( ( $num >> 6 )&63 ) + 128 ) . chr( ( $num&63 ) + 128 );
-       }
-
-       if ( $num < 2097152 ) {
-               return chr( ( $num >> 18 ) + 240 ) . chr( ( ( $num >> 12 )&63 ) + 128 ) . chr( ( ( $num >> 6 )&63 ) + 128 ) . chr( ( $num&63 ) + 128 );
-       }
-
-       return '';
-}
-
-/**
- * Called in some places (currently just extensions)
- * to get the URL for a given file.
- */
-function wfAjaxGetFileUrl( $file ) {
-       $file = wfFindFile( $file );
-
-       if ( !$file || !$file->exists() ) {
-               return null;
-       }
-
-       $url = $file->getUrl();
-
-       return $url;
-}