Fixes for the edit help popup link:

[lhc/web/wiklou.git] / languages / LanguageUtf8.php

diff --git a/languages/LanguageUtf8.php b/languages/LanguageUtf8.php
index 2b9943b..4508691 100644 (file)
--- a/languages/LanguageUtf8.php
+++ b/languages/LanguageUtf8.php
@@ -1,4 +1,5 @@
-<?
+<?php
+if( defined( "MEDIAWIKI" ) ) {
 
 $wgInputEncoding    = "utf-8";
 $wgOutputEncoding      = "utf-8";
@@ -6,8 +7,8 @@ $wgOutputEncoding       = "utf-8";
 $wikiUpperChars = $wgMemc->get( $key1 = "$wgDBname:utf8:upper" );
 $wikiLowerChars = $wgMemc->get( $key2 = "$wgDBname:utf8:lower" );
 
-if(($wikiUpperChars === false) || ($wikiLowerChars === false)) {
-       include_once( "Utf8Case.php" );
+if(empty( $wikiUpperChars) || empty($wikiLowerChars )) {
+       require_once( "includes/Utf8Case.php" );
        $wgMemc->set( $key1, $wikiUpperChars );
        $wgMemc->set( $key2, $wikiLowerChars );
 }
@@ -18,7 +19,7 @@ class LanguageUtf8 extends Language {
        function ucfirst( $string ) {
                # For most languages, this is a wrapper for ucfirst()
                # But that doesn't work right in a UTF-8 locale
-               global $wikiUpperChars, $wikiLowerChars;
+               global $wikiUpperChars;
                return preg_replace (
                "/^([\\x00-\\x7f]|[\\xc0-\\xff][\\x80-\\xbf]*)/e",
                "strtr ( \"\$1\" , \$wikiUpperChars )",
@@ -26,7 +27,7 @@ class LanguageUtf8 extends Language {
        }
        
        function lcfirst( $string ) {
-               global $wikiUpperChars, $wikiLowerChars;
+               global $wikiLowerChars;
                return preg_replace (
                "/^([\\x00-\\x7f]|[\\xc0-\\xff][\\x80-\\xbf]*)/e",
                "strtr ( \"\$1\" , \$wikiLowerChars )",
@@ -63,6 +64,15 @@ class LanguageUtf8 extends Language {
 
                return $this->iconv( $this->fallback8bitEncoding(), "utf-8", $s );
        }
+
+       function firstChar( $s ) {
+               preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' .
+               '[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})/', $s, $matches);
+               
+               return isset( $matches[1] ) ? $matches[1] : "";
+       }
 }
 
+} # ifdef MEDIAWIKI
+
 ?>