Merge remote branch 'upstream/master'
This commit is contained in:
commit
a71e3134bf
64 changed files with 2671 additions and 1873 deletions
|
|
@ -108,6 +108,10 @@ function network_content(&$a, $update = 0) {
|
|||
return login(false);
|
||||
}
|
||||
|
||||
$arr = array('query' => $a->query_string);
|
||||
|
||||
call_hooks('network_content_init', $arr);
|
||||
|
||||
$o = '';
|
||||
|
||||
// item filter tabs
|
||||
|
|
@ -157,7 +161,7 @@ function network_content(&$a, $update = 0) {
|
|||
$all_active = 'active';
|
||||
}
|
||||
|
||||
|
||||
|
||||
$postord_active = '';
|
||||
|
||||
if($all_active && x($_GET,'order') && $_GET['order'] !== 'comment') {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue