mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3989 from sudakk/sudakk-patch-2

Browse Source 
Update cpage.php to prevent empty records.
This commit is contained in:
Cameron
2019-12-28 11:55:46 -08:00
committed by GitHub
parent 598522e603 e72b1ca30e
commit 363eb6751a
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e107_admin/cpage.php
View File

@@ -1037,7 +1037,7 @@ class page_admin_ui extends e_admin_ui
$newdata = e107::getCustomFields()->processDataPost('page_fields',$newdata); $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'])) if(empty($newdata['page_sef']))
{ {
@@ -1081,11 +1081,16 @@ class page_admin_ui extends e_admin_ui
function beforeUpdate($newdata,$olddata, $id) 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); $newdata = e107::getCustomFields()->processDataPost('page_fields',$newdata);
if(isset($newdata['menu_name'])) if(isset($newdata['menu_name']))
{ {
$newdata['menu_name'] = preg_replace('/[^\w-*]/','',$newdata['menu_name']); $newdata['menu_name'] = preg_replace('/[^\w\-*]/','',$newdata['menu_name']);
} }

3
e107_core/bbcodes/bb_p.php
View File

@@ -60,7 +60,8 @@ class bb_p extends e_bb_base
$parms = eHelper::scParams($parm); $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']).'"' : ''; $id = vartrue($parms['id']) ? ' id="'.eHelper::secureIdAttr($parms['id']).'"' : '';
$style = vartrue($parms['style']) ? ' style="'.eHelper::secureStyleAttr($parms['style']).'"' : ''; $style = vartrue($parms['style']) ? ' style="'.eHelper::secureStyleAttr($parms['style']).'"' : '';