0ct0pu5/yellow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated core

Browse source 
Co-Authored-By: GiovanniSalmeri <42720320+GiovanniSalmeri@users.noreply.github.com>
This commit is contained in:
markseu 2024-04-24 16:18:41 +02:00
parent dedd5179b1
commit 6bef5554db
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
system/workers/core.php
View file

@ -2,7 +2,7 @@
// Core extension, https://github.com/annaesvensson/yellow-core
class YellowCore {
const VERSION = "0.9.6";
const VERSION = "0.9.7";
const RELEASE = "0.9";
public $content; // content files
public $media; // media files
@ -3153,11 +3153,11 @@ class YellowPage {
}
// Parse page content element, experimental
public function parseContentElement($name, $text, $attrributes, $type) {
public function parseContentElement($name, $text, $attributes, $type) {
$output = null;
foreach ($this->yellow->extension->data as $key=>$value) {
if (method_exists($value["object"], "onParseContentElement")) {
$output = $value["object"]->onParseContentElement($this, $name, $text, $attrributes, $type);
$output = $value["object"]->onParseContentElement($this, $name, $text, $attributes, $type);
if (!is_null($output)) break;
}
}
@ -3397,8 +3397,17 @@ class YellowPage {
}
// Return page URL
public function getUrl() {
return $this->yellow->lookup->normaliseUrl($this->scheme, $this->address, $this->base, $this->location);
public function getUrl($canoncialUrl = false) {
if ($canoncialUrl) {
$scheme = $this->yellow->system->get("coreServerScheme");
$address = $this->yellow->system->get("coreServerAddress");
$location = $this->yellow->system->get("coreServerBase").$this->location;
} else {
$scheme = $this->scheme;
$address = $this->address;
$location = $this->base.$this->location;
}
return "$scheme://$address$location";
}
// Return page base