------------------------------------------------------------
revno: 1202
committer: Jakub Jankiewicz <[email protected]>
branch nick: aikiframework
timestamp: Wed 2012-05-23 16:46:43 +0200
message:
Fix no pagination marker
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-05-09 19:23:44 +0000
+++ libs/Engine_aiki.php 2012-05-23 14:46:43 +0000
@@ -126,9 +126,9 @@
if (!isset($widget->custom_output)) {
$widget->custom_output = $widget->custome_output;
}
- if (isset($widget->custome_header)) {
- $widget->custom_header = $widget->custome_header;
- }
+ //if (isset($widget->custome_header)) {
+ // $widget->custom_header = $widget->custome_header;
+ //}
if ($widget->custom_output) {
$custom_output = true;
$this->widget_custom_output = true;
@@ -264,6 +264,8 @@
$widget->widget = $widget->nogui_widget;
}
+ $no_pagination = strpos($widget->widget, "[no_pagination]") != false;
+
/**
* @TODO why is this commented out? if no takers, delete!
*/
@@ -378,7 +380,7 @@
// insert pagination.
if ((isset($pagination) || $pagination != false) &&
- strpos($widgetContents, "[no_pagination]") === false) {
+ !$no_pagination) {
if (strpos($widgetContents, "[pagination]")) {
$widgetContents = str_replace("[pagination]",
$pagination,
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
