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

Fixed #3807 - Menu-Manager parser error on themes with hyphen in folder name.

Browse Source
This commit is contained in:
Cameron
2019-05-17 12:53:46 -07:00
parent 2fb44903ab
commit 5e0ddfc36f
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_handlers/e_parse_class.php
View File

@@ -5197,6 +5197,11 @@ return;
return preg_replace('/[^\w]/',"",$text); return preg_replace('/[^\w]/',"",$text);
} }
if($type === 'wd') // words and digits only.
{
return preg_replace('/[^\w\d]/',"",$text);
}
if($type === 'wds') // words, digits and spaces only. if($type === 'wds') // words, digits and spaces only.
{ {
return preg_replace('/[^\w\d ]/',"",$text); return preg_replace('/[^\w\d ]/',"",$text);

2
e107_handlers/menumanager_class.php
View File

@@ -2002,7 +2002,7 @@ class e_menu_layout
$themeFileContent = preg_replace('/\(\s?THEME\s?\./', '( e_THEME. "'.$theme.'/" .', str_replace($srch, '', $themeFileContent)); $themeFileContent = preg_replace('/\(\s?THEME\s?\./', '( e_THEME. "'.$theme.'/" .', str_replace($srch, '', $themeFileContent));
$themeFileContent = str_replace('tablestyle', $theme."_tablestyle",$themeFileContent); // rename function to avoid conflicts while parsing. $themeFileContent = str_replace('tablestyle', $tp->filter($theme, 'wd')."_tablestyle",$themeFileContent); // rename function to avoid conflicts while parsing.
try try
{ {