------------------------------------------------------------
revno: 1194
committer: Jakub Jankiewicz <[email protected]>
branch nick: aikiframework
timestamp: Mon 2012-05-07 13:48:22 +0200
message:
Fix no result issue on Aiki upgraded from old code
modified:
libs/Engine_aiki.php
libs/config.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-01 10:07:40 +0000
+++ libs/Engine_aiki.php 2012-05-07 11:48:22 +0000
@@ -105,11 +105,12 @@
global $aiki, $custom_output ;
// fix custome_.. to custom_..
- if ( isset($widget->custome_output) )
+ 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;
=== modified file 'libs/config.php'
--- libs/config.php 2012-04-25 20:06:54 +0000
+++ libs/config.php 2012-05-07 11:48:22 +0000
@@ -216,12 +216,12 @@
// if any value is valid only seek first.
// note: apps that don't have site/view/language use this way.
- if ( $selector=="*" || $selector=="*/*/*" ){
+ if ($selector=="*" || $selector=="*/*/*") {
$value = $db->get_var($sql);
- if ( is_null($value) ) {
+ if (is_null($value)) {
return $default;
}
- $ret= $this->_unserialize($value);
+ $ret = $this->_unserialize($value);
$config[$setting]= $ret;
return $ret;
}
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
