------------------------------------------------------------
revno: 1217
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Sat 2012-07-07 23:23:34 +0200
message:
Bug #1021628 inherit widget should have markers
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-07-06 22:10:37 +0000
+++ libs/Engine_aiki.php 2012-07-07 21:23:34 +0000
@@ -1064,9 +1064,9 @@
$widget);
}
- private function inline_widgets_helper($match){
- return "";
- return $this->parseWidget($match[1]);
+ private function inline_widgets_helper($match){
+ return "";
+ // @TODO whats?
}
/**
@@ -1103,6 +1103,15 @@
$normal_select = ( isset($widget_para[1]) ? $widget_para[1] : "" );
$widget_html = $this->createWidgetContent($widget_data, $normal_select);
}
+
+ if ( is_debug_on() ){
+ $widget_html =
+ "\n <!--start inherent {$widget_data->widget_name}({$widget_data->id})--> \n".
+ $widget_html.
+ "\n <!--end inherent {$widget_data->widget_name}({$widget_data->id})--> \n";
+ }
+
+
// if the same widget appears two times..it will be replaced.
$widget = str_replace($matches[0][$i], $widget_html, $widget);
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
