------------------------------------------------------------
revno: 985
committer: Jakub Jankiewicz <[email protected]>
branch nick: aikiframework
timestamp: Mon 2011-12-26 20:37:07 +0100
message:
fix bug #885704 with inherit in the begining of the widget
modified:
index.php
libs/widgets.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 'index.php'
--- index.php 2011-12-26 16:44:59 +0000
+++ index.php 2011-12-26 19:37:07 +0000
@@ -105,7 +105,7 @@
} else {
if ( isset($_REQUEST['compress_output']) ||
- ( isset($config["compress_output"]) && $config["compress_output"] ) ) {
+ ( isset($config["compress_output"]) && $config["compress_output"] ) ) {
$html_output = $aiki->Output->compress($html_output);
}
@@ -116,16 +116,16 @@
} // end of using tidy
-if ( $html_cache_file ) {
+if ($html_cache_file) {
//write the cache file
- error_log ( $html_output, 3, $html_cache_file);
+ error_log($html_output, 3, $html_cache_file);
}
/**
* For ending the counter to see the page load time.
*/
if (isset($config["debug"]) and $config["debug"]){
- $end = (float) array_sum(explode(' ',microtime()));
+ $end = (float)array_sum(explode(' ',microtime()));
$end_time = sprintf("%.4f", ($end-$start_time));
echo "\n <!-- queries: ".$db->num_queries." -->\n";
echo "\n <!-- Time: ".$end_time." seconds -->";
=== modified file 'libs/widgets.php'
--- libs/widgets.php 2011-12-11 20:53:28 +0000
+++ libs/widgets.php 2011-12-26 19:37:07 +0000
@@ -315,8 +315,7 @@
private function createWidgetContent($widget, $normal_select=false) {
global $aiki, $db, $membership, $nogui, $custom_output, $config;
- $is_inline = ( $normal_select ? true : false );
-
+ $is_inline = ( $normal_select !== false ? true : false );
$stopcaching = false;
if ( isset($config["widget_cache"]) &&
$config["widget_cache"] &&
@@ -1215,7 +1214,7 @@
foreach ($matches['1'] as $i=>$widget_info) {
$widget_para = explode("|", $widget_info);
$widget_id = $this->get_widget_id($widget_para[0]);
- $normal_select = ( isset($widget_para[1]) ? $widget_para[1] :"" );
+ $normal_select = ( isset($widget_para[1]) ? $widget_para[1] : "" );
$widget_data = $db->get_row(
"SELECT * FROM aiki_widgets WHERE id='{$widget_id}' LIMIT 1");
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
