SeaCMS/pico
3
0
Fork 0
Code Issues Pull Requests Activity

Fix possible foreach on null errors

Browse Source
This commit is contained in:
Daniel Rudolf 2015-11-03 23:49:34 +01:00
parent 82e0ca5216
commit 90128f4946
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Pico.php
View File

@ -812,6 +812,7 @@ class Pico
$content = str_replace('%theme_url%', $themeUrl, $content); $content = str_replace('%theme_url%', $themeUrl, $content);
// replace %meta.*% // replace %meta.*%
if (!empty($this->meta)) {
$metaKeys = $metaValues = array(); $metaKeys = $metaValues = array();
foreach ($this->meta as $metaKey => $metaValue) { foreach ($this->meta as $metaKey => $metaValue) {
if (is_scalar($metaValue) || ($metaValue === null)) { if (is_scalar($metaValue) || ($metaValue === null)) {
@ -820,6 +821,7 @@ class Pico
} }
} }
$content = str_replace($metaKeys, $metaValues, $content); $content = str_replace($metaKeys, $metaValues, $content);
}
return $content; return $content;
} }
@ -1240,6 +1242,7 @@ class Pico
*/ */
protected function triggerEvent($eventName, array $params = array()) protected function triggerEvent($eventName, array $params = array())
{ {
if (!empty($this->plugins)) {
foreach ($this->plugins as $plugin) { foreach ($this->plugins as $plugin) {
// only trigger events for plugins that implement PicoPluginInterface // only trigger events for plugins that implement PicoPluginInterface
// deprecated events (plugins for Pico 0.9 and older) will be // deprecated events (plugins for Pico 0.9 and older) will be
@ -1249,4 +1252,5 @@ class Pico
} }
} }
} }
}
} }