Dominique.Fournier/DomFramework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Do the replacement at the end (to update {baseurl} if it is set by the {javascript}

Browse Source 
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@4714 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
Dominique Fournier
2018-11-15 14:09:06 +00:00
parent 5fc4b3b89a
commit 38efa5468a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
outputhtml.php
View File

@@ -87,12 +87,6 @@ class outputhtml extends output
EOT; EOT;
} }
// Do the title replacement in the replacement structure
if (! isset ($replacement["{flash}"]))
$replacement["{flash}"] = "";
foreach ($replacement as $key=>$val)
$layoutPage = str_replace ($key, $val, $layoutPage);
// All the entries coming from views in array are substitute in layout // All the entries coming from views in array are substitute in layout
// {content}, {title} // {content}, {title}
if (is_array ($resView)) if (is_array ($resView))
@@ -105,6 +99,12 @@ EOT;
else else
$layoutPage = str_replace ("{content}", $resView, $layoutPage); $layoutPage = str_replace ("{content}", $resView, $layoutPage);
// Do the title replacement in the replacement structure
if (! isset ($replacement["{flash}"]))
$replacement["{flash}"] = "";
foreach ($replacement as $key=>$val)
$layoutPage = str_replace ($key, $val, $layoutPage);
// Remove the not used {XXX} // Remove the not used {XXX}
$layoutPage = preg_replace ("~({\S+})~", "", $layoutPage); $layoutPage = preg_replace ("~({\S+})~", "", $layoutPage);