Merge remote branch 'upstream/master'

2012-05-25 16:19:10 +02:00
parent 8c80fe0bf5 d1345e5054
commit a71e3134bf
64 changed files with 2673 additions and 1875 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') {