------------------------------------------------------------
revno: 1167
committer: Jakub Jankiewicz <jcu...@onet.pl>
branch nick: aikiframework
timestamp: Mon 2012-04-23 14:31:10 +0200
message:
handle url parts before (sql( when there is normal_select
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 19:34:39 +0000
+++ libs/Engine_aiki.php 2012-04-23 12:31:10 +0000
@@ -749,6 +749,7 @@
$template = $aiki->Records->edit_in_place($template, $values);
$template = $aiki->text->aiki_nl2br($template);
$template = $aiki->text->aiki_nl2p($template);
+ $template = $aiki->url->apply_url_on_query($template);
$template = $aiki->SqlMarkup->sql($template);
return $template;
}
@@ -1081,11 +1082,11 @@
$this->target["css"][$widget_data->id]=true ;
}
$normal_select = ( isset($widget_para[1]) ? $widget_para[1] : "" );
- $widget_html = $this->createWidgetContent($widget_data, $normal_select);
+ $widget_html = $this->createWidgetContent($widget_data, $normal_select);
}
-
// 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 : aikiframework-devel@lists.launchpad.net
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
