From b5fb0969fd0be23d4fb54170bb9da7b43832ed93 Mon Sep 17 00:00:00 2001 From: GenkaOk Date: Sun, 16 Aug 2020 15:35:35 +0300 Subject: [PATCH] Update pdomenu.class.php Fix notices: ``` Notice: Undefined index: content in /core/components/pdotools/model/pdotools/pdomenu.class.php on line 248 Notice: Undefined index: class_key in /core/components/pdotools/model/pdotools/pdomenu.class.php on line 190 Notice: Undefined index: class_key in /core/components/pdotools/model/pdotools/pdomenu.class.php on line 274 ``` --- core/components/pdotools/model/pdotools/pdomenu.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/components/pdotools/model/pdotools/pdomenu.class.php b/core/components/pdotools/model/pdotools/pdomenu.class.php index 7d26a9c7..3ee7dbd2 100644 --- a/core/components/pdotools/model/pdotools/pdomenu.class.php +++ b/core/components/pdotools/model/pdotools/pdomenu.class.php @@ -187,7 +187,7 @@ public function templateBranch($row = array()) $row['classNames'] = $row['classnames'] = $row['classes'] = ''; } - if (!empty($this->pdoTools->config['useWeblinkUrl']) && $row['class_key'] == 'modWebLink') { + if (!empty($this->pdoTools->config['useWeblinkUrl']) && !empty($row['class_key']) && $row['class_key'] == 'modWebLink') { unset($row['context_key']); $row['link'] = is_numeric(trim($row['content'], '[]~ ')) ? $this->pdoTools->makeUrl(intval(trim($row['content'], '[]~ ')), $row) @@ -245,7 +245,7 @@ public function getClasses($row = array()) if ($row['children'] && !empty($this->pdoTools->config['parentClass']) && ($row['level'] < $this->pdoTools->config['level'] || empty($this->pdoTools->config['level']))) { $classes[] = $this->pdoTools->config['parentClass']; } - $row_id = !empty($this->pdoTools->config['useWeblinkUrl']) && is_numeric(trim($row['content'], '[]~ ')) && $row['class_key'] == 'modWebLink' + $row_id = !empty($this->pdoTools->config['useWeblinkUrl']) && !empty($row['content']) && !empty($row['class_key']) && is_numeric(trim($row['content'], '[]~ ')) && $row['class_key'] == 'modWebLink' ? intval(trim($row['content'], '[]~ ')) : $row['id']; if ($this->isHere($row_id) && !empty($this->pdoTools->config['hereClass'])) { @@ -271,7 +271,7 @@ public function getClasses($row = array()) */ public function getTpl($row = array()) { - $row_id = !empty($this->pdoTools->config['useWeblinkUrl']) && $row['class_key'] == 'modWebLink' && is_numeric(trim($row['content'], '[]~ ')) + $row_id = !empty($this->pdoTools->config['useWeblinkUrl']) && !empty($row['class_key']) && !empty($row['content']) && $row['class_key'] == 'modWebLink' && is_numeric(trim($row['content'], '[]~ ')) ? intval(trim($row['content'], '[]~ ')) : $row['id']; if ($row['level'] == 1 && !empty($this->pdoTools->config['tplStart']) && !empty($this->pdoTools->config['displayStart'])) {