From d01a0b6e8355396981d74fc705d4051a68f772a8 Mon Sep 17 00:00:00 2001 From: sudakk Date: Mon, 28 Oct 2019 21:59:32 +0300 Subject: [PATCH 1/2] Update bb_p.php Tested on custom pages & news --- e107_core/bbcodes/bb_p.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e107_core/bbcodes/bb_p.php b/e107_core/bbcodes/bb_p.php index ee6827db0..8b6d18e2b 100644 --- a/e107_core/bbcodes/bb_p.php +++ b/e107_core/bbcodes/bb_p.php @@ -60,7 +60,8 @@ class bb_p extends e_bb_base $parms = eHelper::scParams($parm); - $class = " ".e107::getBB()->getClass('p'); // consistent classes across all themes. + $class = vartrue($parms['class']) ? ' class="'.eHelper::secureClassAttr($parms['class']).' ' : ' class="'; + $class .= e107::getBB()->getClass('p').'"'; // consistent classes across all themes. $id = vartrue($parms['id']) ? ' id="'.eHelper::secureIdAttr($parms['id']).'"' : ''; $style = vartrue($parms['style']) ? ' style="'.eHelper::secureStyleAttr($parms['style']).'"' : ''; From e72b1ca30e9efa4a50819c5b4a48f843cf7882b4 Mon Sep 17 00:00:00 2001 From: sudakk Date: Mon, 28 Oct 2019 22:24:05 +0300 Subject: [PATCH 2/2] Update cpage.php Added check to prevent saving page\menu with empty page_title & menu_name fields when edit. --- e107_admin/cpage.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php index 073d58ea4..b6f95f28d 100644 --- a/e107_admin/cpage.php +++ b/e107_admin/cpage.php @@ -1030,7 +1030,7 @@ class page_admin_ui extends e_admin_ui $newdata = e107::getCustomFields()->processDataPost('page_fields',$newdata); - $newdata['menu_name'] = preg_replace('/[^\w-*]/','-',$newdata['menu_name']); + $newdata['menu_name'] = preg_replace('/[^\w\-*]/','-',$newdata['menu_name']); if(empty($newdata['page_sef'])) { @@ -1074,11 +1074,16 @@ class page_admin_ui extends e_admin_ui function beforeUpdate($newdata,$olddata, $id) { + if(isset($newdata['page_title']) && isset($newdata['menu_name']) && empty($newdata['page_title']) && empty($newdata['menu_name'])) + { + e107::getMessage()->addError(CUSLAN_79); + return false; + } $newdata = e107::getCustomFields()->processDataPost('page_fields',$newdata); if(isset($newdata['menu_name'])) { - $newdata['menu_name'] = preg_replace('/[^\w-*]/','',$newdata['menu_name']); + $newdata['menu_name'] = preg_replace('/[^\w\-*]/','',$newdata['menu_name']); }