harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

silence some warnings at php E_ALL levels

Browse Source
This commit is contained in:
friendica
2013-08-28 21:56:01 -07:00
parent 7b27add546
commit b4bd518e40
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mod/network.php
View File

@@ -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) {