From 583c3ed37bab01d868f52bed320aba68b12a0126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Fri, 22 Oct 2021 15:51:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AF=BB=E5=8F=960=E5=AD=97=E8=8A=82?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=9A=84=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/libraries/html_optimize_lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/libraries/html_optimize_lib.php b/application/libraries/html_optimize_lib.php index d241bd6e..41c77dad 100644 --- a/application/libraries/html_optimize_lib.php +++ b/application/libraries/html_optimize_lib.php @@ -125,8 +125,8 @@ class html_optimize_lib $file_path = $imagesPath . $img_src_urls['path']; } if (is_file($file_path)) { - $properties = getimagesize($file_path);//获取图片属性 - if (!empty($properties[0]) && !empty($properties[1])) { + $properties = getimagesize($file_path);//获取图片属性，读取失败返回false + if ($properties && !empty($properties[0]) && !empty($properties[1])) { $image->width = $properties[0]; $image->height = $properties[1]; } From bafa2dfe14741d73f625c7adb4eefa02a312df6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Mon, 25 Oct 2021 09:50:31 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap/header.php | 12 +++++++++++- application/views/bootstrap3/header.php | 10 ++++++++++ application/views/header.php | 13 +++++++++++-- application/views/login.php | 9 +++++++++ 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/application/views/bootstrap/header.php b/application/views/bootstrap/header.php index d0540637..21256c13 100644 --- a/application/views/bootstrap/header.php +++ b/application/views/bootstrap/header.php @@ -53,7 +53,17 @@ window.location.href = window.location.href; }); } - + + + diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index 44aee7cc..cbfa2c05 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -103,6 +103,16 @@ } + + diff --git a/application/views/header.php b/application/views/header.php index eb1c5302..bea2a638 100644 --- a/application/views/header.php +++ b/application/views/header.php @@ -35,8 +35,17 @@ } } - - + + +
diff --git a/application/views/login.php b/application/views/login.php index b157ad70..7d14e47a 100644 --- a/application/views/login.php +++ b/application/views/login.php @@ -13,6 +13,15 @@ + From 52283f38695611db593c4a4405c92bc1f2f40219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Mon, 25 Oct 2021 09:53:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap/login.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/application/views/bootstrap/login.php b/application/views/bootstrap/login.php index 2b2c391b..96102caf 100644 --- a/application/views/bootstrap/login.php +++ b/application/views/bootstrap/login.php @@ -22,6 +22,15 @@ --> + From 79ef39120cb75e8b377159a7067502152f2b12c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Mon, 25 Oct 2021 10:19:10 +0800 Subject: [PATCH 4/5] fix --- application/views/mobile_first/chinatravel-flight-index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/mobile_first/chinatravel-flight-index.php b/application/views/mobile_first/chinatravel-flight-index.php index eb8b0a63..6c71b2ec 100644 --- a/application/views/mobile_first/chinatravel-flight-index.php +++ b/application/views/mobile_first/chinatravel-flight-index.php @@ -45,7 +45,7 @@
\ No newline at end of file From 11ac553c19427bda886ad8492f5d5c59c4650e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Tue, 26 Oct 2021 11:08:59 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B5=B5=E7=82=8E?= =?UTF-8?q?=E4=B8=BA=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/config/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/config/config.php b/application/config/config.php index eb0ef45a..7f11c37a 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -691,7 +691,7 @@ $config['project_state'] = array( //是否开启权限控制 $config['check_access'] = TRUE; //权限管理超级管理 -$config['access_super_manage'] = array('ycc', 'lmr', 'lyj', 'cyc', 'zp'); +$config['access_super_manage'] = array('ycc', 'lmr', 'lyj', 'rz', 'zp'); //编辑器预览样式路径 $config['css_source_cht'] = 'https://data.chinahighlights.com/css/min.php?f=/public/css/global.min.css,/css/festival-detail.css';