再次修改函数名；

zblogcn · Jan 21, 2017 · 64eea82 · 64eea82
1 parent 4c3ecf7
commit 64eea82
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/zb_system/function/c_system_common.php b/zb_system/function/c_system_common.php
@@ -1314,7 +1314,7 @@ function utf84mb_convertToUTF8($matches) {
 
 
 //$args = 2...x
-function VerfiyWebToken($wt,$wt_id){
+function VerifyWebToken($wt,$wt_id){
     $time = substr($wt,32);
     $wt = substr($wt,0,32);
     $args = array();

diff --git a/zb_system/function/c_system_version.php b/zb_system/function/c_system_version.php
@@ -17,7 +17,7 @@
 define('ZC_VERSION_MAJOR', '1');
 define('ZC_VERSION_MINOR', '5');
 define('ZC_VERSION_BUILD', '1');
-define('ZC_VERSION_COMMIT', '1737');
+define('ZC_VERSION_COMMIT', '1739');
 define('ZC_VERSION_CODENAME', 'Zero');
 define('ZC_VERSION', ZC_VERSION_MAJOR . '.' . ZC_VERSION_MINOR . '.' . ZC_VERSION_BUILD . '.' . ZC_VERSION_COMMIT);
 define('ZC_VERSION_DISPLAY', ZC_VERSION_MAJOR . '.' . ZC_VERSION_MINOR . '.' . ZC_VERSION_BUILD  .' ' . ZC_VERSION_CODENAME);

diff --git a/zb_system/function/lib/zblogphp.php b/zb_system/function/lib/zblogphp.php
@@ -1134,7 +1134,7 @@ public function Verify_Token($name, $wt, $wt_id, &$member = null) {
         $m = null;
         $m = $this->GetMemberByName($name);
         if ($m->ID > 0) {
-            if( VerfiyWebToken($wt, $wt_id, $this->guid, $m->ID, $m->Password) === true ){
+            if( VerifyWebToken($wt, $wt_id, $this->guid, $m->ID, $m->Password) === true ){
                 $member = $m;
                 return true;
             }
@@ -2443,7 +2443,7 @@ public function GetWebToken($wt_id = '', $day = 1 ) {
      */
     public function ValidWebToken($wt, $wt_id = '') {
 
-        if( VerfiyWebToken($wt, $wt_id, $this->guid, $this->user->Guid, $this->user->ID, $this->user->Password) === true ){
+        if( VerifyWebToken($wt, $wt_id, $this->guid, $this->user->Guid, $this->user->ID, $this->user->Password) === true ){
             return true;
         }
 

diff --git a/zb_users/language/en.php b/zb_users/language/en.php
@@ -244,7 +244,7 @@
         'comment_audit' => 'Aduit Comments',
         'comment_audit_comment' => 'All new comments posted by non-root user will be audited.',
         'debugging_warning' => 'If your website can be connected via Internet, please disable the Development Mode, or it may be hacked.',
-        'permanent_domain_with_admin' => '后台也使用固定域名',
+        'permanent_domain_with_admin' => 'Fixed domain both on background',
         '' => '',
     ),
 

diff --git a/zb_users/language/zh-tw.php b/zb_users/language/zh-tw.php
@@ -244,6 +244,7 @@
         'comment_audit' => '審核迴響',
         'comment_audit_comment' => '打開後所有非管理員發布的迴響都將進入審核狀態',
         'debugging_warning' => '您的Z-BlogPHP處於開發模式下。此模式下網站有被骇的風險，實際部署在線上的網站請及時關閉開發模式！',
+        'permanent_domain_with_admin' => '后台也使用永久域名',
         '' => '',
     ),