From 7edfdb08d30fee9aa62ac165baacb186cad37e8c Mon Sep 17 00:00:00 2001
From: Terry <2358269014@qq.com>
Date: Tue, 21 Apr 2020 17:54:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dfecmall=E5=9C=A8php-7.4?=
 =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E7=9A=84=E7=89=88=E6=9C=AC=E4=B8=8D=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/Catalog/block/categoryupload/Manager.php         | 2 +-
 app/appadmin/modules/System/block/extensionmarket/Login.php  | 2 +-
 lib/google/lib/auth/Google_Utils.php                         | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/appadmin/modules/Catalog/block/categoryupload/Manager.php b/app/appadmin/modules/Catalog/block/categoryupload/Manager.php
index 3b24a6a1f..d0f4c0714 100644
--- a/app/appadmin/modules/Catalog/block/categoryupload/Manager.php
+++ b/app/appadmin/modules/Catalog/block/categoryupload/Manager.php
@@ -30,7 +30,7 @@ public function init()
         /*
          * service component, data provider
          */
-        parent::init();
+        // parent::init();
     }
 
     public function getLastData()
diff --git a/app/appadmin/modules/System/block/extensionmarket/Login.php b/app/appadmin/modules/System/block/extensionmarket/Login.php
index 4baecb8b6..9df3aef0b 100644
--- a/app/appadmin/modules/System/block/extensionmarket/Login.php
+++ b/app/appadmin/modules/System/block/extensionmarket/Login.php
@@ -28,7 +28,7 @@ class Login
      */
     public function init()
     {
-        parent::init();
+        // parent::init();
     }
 
     public function getLastData()
diff --git a/lib/google/lib/auth/Google_Utils.php b/lib/google/lib/auth/Google_Utils.php
index be94902c2..37f5a1508 100644
--- a/lib/google/lib/auth/Google_Utils.php
+++ b/lib/google/lib/auth/Google_Utils.php
@@ -55,7 +55,8 @@ static public function getStrLen($str) {
     $strlenVar = strlen($str);
     $d = $ret = 0;
     for ($count = 0; $count < $strlenVar; ++ $count) {
-      $ordinalValue = ord($str{$ret});
+      //$ordinalValue = ord($str{$ret});
+      $ordinalValue = ord(substr($str,$ret, 1));
       switch (true) {
         case (($ordinalValue >= 0x20) && ($ordinalValue <= 0x7F)):
           // characters U-00000000 - U-0000007F (same as ASCII)
@@ -114,4 +115,4 @@ public static function normalize($arr) {
     }
     return $normalized;
   }
-}
\ No newline at end of file
+}