forked from projects/fipamo
Merge branch 'develop' into beta
Merging page meta image change
This commit is contained in:
commit
1c7fcd6664
1 changed files with 7 additions and 0 deletions
|
@ -23,6 +23,7 @@ class Render
|
||||||
"description" => $settings["global"]["descriptions"],
|
"description" => $settings["global"]["descriptions"],
|
||||||
"image" =>
|
"image" =>
|
||||||
$settings["global"]["base_url"] . $settings["global"]["background"],
|
$settings["global"]["base_url"] . $settings["global"]["background"],
|
||||||
|
"baseURL" => $settings["global"]["base_url"],
|
||||||
];
|
];
|
||||||
//copy current theme assets to public
|
//copy current theme assets to public
|
||||||
if (is_file("../public/assets/css/base.css")) {
|
if (is_file("../public/assets/css/base.css")) {
|
||||||
|
@ -120,6 +121,12 @@ class Render
|
||||||
//$cleaned = preg_replace('/(?:\r\n|[\r\n]){2,}/', "\n\n", $cleaned);
|
//$cleaned = preg_replace('/(?:\r\n|[\r\n]){2,}/', "\n\n", $cleaned);
|
||||||
//$cleaned = html_entity_decode($cleaned, ENT_QUOTES, "UTF-8");
|
//$cleaned = html_entity_decode($cleaned, ENT_QUOTES, "UTF-8");
|
||||||
|
|
||||||
|
//if page feature isn't empty, replace page info meta image
|
||||||
|
if ($page["feature"] != "" || $page["feature"] != null) {
|
||||||
|
$this->pageInfo["image"] =
|
||||||
|
$this->pageInfo["baseURL"] . $page["feature"];
|
||||||
|
}
|
||||||
|
|
||||||
if ($page["layout"] == "index") {
|
if ($page["layout"] == "index") {
|
||||||
$template = $this->theme . "/index.twig";
|
$template = $this->theme . "/index.twig";
|
||||||
$location = "../public/index.html";
|
$location = "../public/index.html";
|
||||||
|
|
Loading…
Reference in a new issue