diff options
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rwxr-xr-x | include/friendica_smarty.php | 2 | ||||
| -rw-r--r-- | mod/network.php | 12 | ||||
| -rw-r--r-- | mod/update_network.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/php/theme.php | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/include/conversation.php b/include/conversation.php index 8648209e9..82010b153 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -394,7 +394,9 @@ function visible_activity($item) { function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { $tstart = dba_timer(); + $t0 = $t1 = $t2 = $t3 = $t4 = $t5 = $t6 = null; $content_html = ''; + $o = ''; require_once('bbcode.php'); diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php index 1e8ef5406..12a789c9a 100755 --- a/include/friendica_smarty.php +++ b/include/friendica_smarty.php @@ -49,7 +49,7 @@ class FriendicaSmartyEngine implements ITemplateEngine { public function __construct(){ $a = get_app(); - $basecompiledir = $a->config['system']['smarty3_folder']; + $basecompiledir = ((array_key_exists('smarty3_folder',$a->config['system'])) ? $a->config['system']['smarty3_folder'] : ''); if (!$basecompiledir) $basecompiledir = dirname(__dir__)."/view/tpl/smarty3"; if (!is_dir($basecompiledir)) { echo "<b>ERROR:</b> folder <tt>$basecompiledir</tt> does not exist."; killme(); diff --git a/mod/network.php b/mod/network.php index 39e6fe215..b2ff671c7 100644 --- a/mod/network.php +++ b/mod/network.php @@ -325,9 +325,9 @@ function network_content(&$a, $update = 0, $load = false) { // save selected tab, but only if not in search or file mode - if(!x($_GET,'search') && !x($_GET,'file')) { - set_pconfig( local_user(), 'network.view','tab.selected',array($all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) ); - } +// if(!x($_GET,'search') && !x($_GET,'file')) { +// set_pconfig( local_user(), 'network.view','tab.selected',array($all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) ); +// } $contact_id = $a->cid; @@ -500,7 +500,7 @@ function network_content(&$a, $update = 0, $load = false) { '$nouveau' => (($nouveau) ? $nouveau : '0'), '$wall' => '0', '$page' => (($a->pager['page'] != 1) ? $a->pager['page'] : 1), - '$search' => $search, + '$search' => (($search) ? $search : ''), '$order' => $order, '$file' => $file, '$cats' => '', @@ -641,6 +641,8 @@ function network_content(&$a, $update = 0, $load = false) { $first = dba_timer(); // Then fetch all the children of the parents that are on this page + $parents_str = ''; + $update_unseen = ''; if($r) { @@ -699,7 +701,7 @@ function network_content(&$a, $update = 0, $load = false) { $sixth = dba_timer(); - if(! $update) + if(($items) && (! $update)) $o .= alt_pager($a,count($items)); if($load) { diff --git a/mod/update_network.php b/mod/update_network.php index bb6245f65..0021af876 100644 --- a/mod/update_network.php +++ b/mod/update_network.php @@ -11,7 +11,7 @@ function update_network_content(&$a) { $load = (((argc() > 1) && (argv(1) == 'load')) ? 1 : 0); header("Content-type: text/html"); echo "<!DOCTYPE html><html><body>\r\n"; - echo (($_GET['msie'] == 1) ? '<div>' : '<section>'); + echo ((array_key_exists('msie',$_GET) && $_GET['msie'] == 1) ? '<div>' : '<section>'); $text = network_content($a,$profile_uid, $load); @@ -32,7 +32,7 @@ function update_network_content(&$a) { } echo str_replace("\t",' ',$text); - echo (($_GET['msie'] == 1) ? '</div>' : '</section>'); + echo ((array_key_exists('msie',$_GET) && $_GET['msie'] == 1) ? '</div>' : '</section>'); echo "</body></html>\r\n"; // logger('update_network: ' . $text); killme(); diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php index 3d69a7e22..ca280ef6a 100644 --- a/view/theme/redbasic/php/theme.php +++ b/view/theme/redbasic/php/theme.php @@ -1,9 +1,5 @@ <?php function redbasic_init(&$a) { - if($a->config['system']['theme_engine']) - $a->set_template_engine($a->config['system']['theme_engine']); - else - $a->set_template_engine('smarty3'); -// head_add_js('redbasic.js'); + } |