------------------------------------------------------------
revno: 1159
committer: Jakub Jankiewicz <[email protected]>
branch nick: aikiframework
timestamp: Tue 2012-04-10 11:05:01 +0200
message:
Fix (script( and inline edit
modified:
libs/AikiScript.php
libs/Records.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/AikiScript.php'
--- libs/AikiScript.php 2012-04-04 19:09:23 +0000
+++ libs/AikiScript.php 2012-04-10 09:05:01 +0000
@@ -59,7 +59,7 @@
//$text = stripslashes($text);
if ( $searchIn ) {
- if (preg_match("/\<textarea.*((\<php |\(script\().*(\)script\)|php\>)).*\<\/textarea\>/Us", $text)) {
+ if (preg_match("/<textarea[^>]*>((<php |\(script\().*(\)script\)|php>)).*<\/textarea>/Us", $text)) {
return $text;
}
// now, we will divided the text. The array is always
@@ -135,7 +135,7 @@
break;
case '$aiki':
- if (preg_match('/\$aiki\-\>(.*)\-\>(.*)\((.*?)\)\;?/Us',
+ if (preg_match('/\$aiki\-\>(.*)\-\>(.*)\((.*)\)\;?/Us',
$php_function, $partial)) {
$php_output = $this->aiki_function($partial[1],
$partial[2], $partial[3]);
=== modified file 'libs/Records.php'
--- libs/Records.php 2012-01-21 13:14:54 +0000
+++ libs/Records.php 2012-04-10 09:05:01 +0000
@@ -1415,7 +1415,9 @@
$user = $aiki->get_string_between($edit ,
"<user>", "</user>");
if ($user) {
- $user = $widget_value->$user;
+ if (isset($widget_value->$user)) {
+ $user = $widget_value->$user;
+ }
} else {
$user = '';
}
@@ -1430,7 +1432,8 @@
/**
* @todo why is this code commented out?
*/
- $output = "(($field))";
+ //$output = "(($field))";
+ $output = $widget_value->$field;
// $output = $layout->parsDBpars($output,
// $widget_value);
}
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
