------------------------------------------------------------
revno: 1036
committer: rejon <[email protected]>
branch nick: public
timestamp: Thu 2012-01-19 08:01:17 +0000
message:
* added jakub's scope fix for arrays in database
* fixed the pagination bug and clearing out [pagination] if no paging
* fixed spelling in setup_plugin.php
modified:
.bzrignore
assets/images/agpl.png*
assets/images/external.png*
assets/images/favicon.ico*
libs/database/index.php
libs/widgets.php
setup_plugin.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 '.bzrignore'
--- .bzrignore 2011-12-26 16:44:59 +0000
+++ .bzrignore 2012-01-19 08:01:17 +0000
@@ -3,3 +3,6 @@
autom4te.cache
autom4te.cache/*
autom4te.cache/**/*
+/.git*
+/.htaccess
+/config.php
=== modified file 'assets/images/agpl.png' (properties changed: +x to -x)
=== modified file 'assets/images/external.png' (properties changed: +x to -x)
=== modified file 'assets/images/favicon.ico' (properties changed: +x to -x)
Binary files assets/images/favicon.ico 2011-11-08 13:42:45 +0000 and assets/images/favicon.ico 2012-01-19 08:01:17 +0000 differ
=== modified file 'libs/database/index.php'
--- libs/database/index.php 2012-01-05 18:48:50 +0000
+++ libs/database/index.php 2012-01-19 08:01:17 +0000
@@ -253,7 +253,7 @@
{
$this->query($query);
}
-
+ $new_array = array();
// Extract the column values
for ( $i=0; $i < count($this->last_result); $i++ )
{
@@ -290,6 +290,7 @@
if ( $this->last_result )
{
$i=0;
+ $new_array = array();
foreach( $this->last_result as $row )
{
=== modified file 'libs/widgets.php'
--- libs/widgets.php 2012-01-17 14:17:40 +0000
+++ libs/widgets.php 2012-01-19 08:01:17 +0000
@@ -489,7 +489,7 @@
$widgetContents = $this->parse_hits($widgetContents);
// insert pagination.
- if ( $pagination != false && strpos($widgetContents, "[no_pagination]") === false ) {
+ if ( (isset($pagination) || $pagination != false) && strpos($widgetContents, "[no_pagination]") === false ) {
if (strpos($widgetContents, "[pagination]")) {
$widgetContents = str_replace(
"[pagination]",
@@ -689,7 +689,7 @@
}
if ( $numpages <= 1 ) {
- return "";
+ return "";
}
$widget->link_example = $aiki->input->requests($widget->link_example);
=== modified file 'setup_plugin.php'
--- setup_plugin.php 2012-01-19 07:04:41 +0000
+++ setup_plugin.php 2012-01-19 08:01:17 +0000
@@ -38,7 +38,7 @@
echo "No plugins is found or all have configuration\n";
} else {
foreach ($ids as $id){
- echo "lugin {$id->plugin_name} activated for *\n";
+ echo "plugin {$id->plugin_name} activated for *\n";
plugins::insert_plugin_configuration($id->plugin_id,"*");
}
}
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
