diff options
| author | friendica <info@friendica.com> | 2013-08-28 21:56:01 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-08-28 21:56:01 -0700 |
| commit | b4bd518e4032661cdfba4e17acdb94e19b23fdd2 (patch) | |
| tree | e6bf0cdfd844bcddb43f1579c42767abe9d5a7c8 /mod/network.php | |
| parent | 7b27add5468ae38534b8bceb458520e6c603da75 (diff) | |
| download | volse-hubzilla-b4bd518e4032661cdfba4e17acdb94e19b23fdd2.tar.gz volse-hubzilla-b4bd518e4032661cdfba4e17acdb94e19b23fdd2.tar.bz2 volse-hubzilla-b4bd518e4032661cdfba4e17acdb94e19b23fdd2.zip | |
silence some warnings at php E_ALL levels
Diffstat (limited to 'mod/network.php')
| -rw-r--r-- | mod/network.php | 12 |
1 files changed, 7 insertions, 5 deletions
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) { |