------------------------------------------------------------
revno: 1165
committer: Jakub Jankiewicz <[email protected]>
branch nick: aikiframework
timestamp: Fri 2012-04-20 21:34:39 +0200
message:
Fix bug #986291
modified:
libs/Engine_aiki.php
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'libs/Engine_aiki.php'
--- libs/Engine_aiki.php 2012-04-20 17:33:23 +0000
+++ libs/Engine_aiki.php 2012-04-20 19:34:39 +0000
@@ -787,7 +787,9 @@
} else {
$cached_values = false;
}
-
+ // isset on NULL value return false need to check keys
+ $keys = array_keys(get_object_vars($widget_value));
+
foreach ($matches['1'] as $parsed) {
if ($parsed) {
$is_array = $aiki->get_string_between($parsed, "[", "]");
@@ -839,26 +841,28 @@
}
}
+
if (!isset($widget_value->$parsed) and
isset($this->global_values->$parsed)) {
$widget_value->$parsed = $this->global_values->$parsed;
}
- if (isset($widget_value->$parsed)) {
+ if (in_array($parsed, $keys)) {
+ //if (isset($widget_value->$parsed)) {
+
$widget_value->$parsed =
$aiki->security->remove_markup($widget_value->$parsed);
// If there are results and the results are not from cache
// then cache them.
if ( $widget_value->$parsed and !$cached_values ) {
$this->global_values->$parsed = $widget_value->$parsed;
- }
+ }
+
$text = str_replace(
"(($parsed))",
$widget_value->$parsed,
$text);
}
-
-
} // end of if ($parsed)
} // end of foreach
return $text;
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
