Try again to fix wrong variable scope...

diff --git a/includes/ZhClient.php b/includes/ZhClient.php
index 7e775e3..3982ca6 100644 (file)
--- a/includes/ZhClient.php
+++ b/includes/ZhClient.php
@@ -145,7 +145,6 @@ class ZhClient {
 
 
 class ZhClientFake {
-
        function ZhClientFake() {
                global $wgMemc, $wgDBname;
                $this->zh2TW = $wgMemc->get($key1 = "$wgDBname:zhConvert:tw");
@@ -153,8 +152,7 @@ class ZhClientFake {
                $this->zh2SG = $wgMemc->get($key3 = "$wgDBname:zhConvert:sg");
                $this->zh2HK = $wgMemc->get($key4 = "$wgDBname:zhConvert:hk");
                if(empty($this->zh2TW) || empty($this->zh2CN) || empty($this->zh2SG) || empty($this->zh2HK)) {
-                       require_once("includes/ZhConversion.php");
-                       global $zh2TW, $zh2CN, $zh2HK, $zh2SG;
+                       require("includes/ZhConversion.php");
                        $this->zh2TW = $zh2TW;
                        $this->zh2CN = $zh2CN;
                        $this->zh2HK = $zh2HK;