Network page: Selecting a forum overrides the group selection
This commit is contained in:
		
					parent
					
						
							
								3fbf2e3bcf
							
						
					
				
			
			
				commit
				
					
						661f9af93a
					
				
			
		
					 1 changed files with 6 additions and 4 deletions
				
			
		| 
						 | 
				
			
			@ -39,12 +39,17 @@ function network_init(App $a) {
 | 
			
		|||
	}
 | 
			
		||||
 | 
			
		||||
	$is_a_date_query = false;
 | 
			
		||||
 | 
			
		||||
	$group_id = (($a->argc > 1 && is_numeric($a->argv[1])) ? intval($a->argv[1]) : 0);
 | 
			
		||||
 | 
			
		||||
	if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
 | 
			
		||||
		$cid = $_GET['cid'];
 | 
			
		||||
		$_GET['nets'] = 'all';
 | 
			
		||||
 | 
			
		||||
		$group_id = 0;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	PConfig::set(local_user(), 'network.view', 'group.selected', $group_id);
 | 
			
		||||
 | 
			
		||||
	if ($a->argc > 1) {
 | 
			
		||||
		for ($x = 1; $x < $a->argc; $x ++) {
 | 
			
		||||
			if (is_a_date_arg($a->argv[$x])) {
 | 
			
		||||
| 
						 | 
				
			
			@ -145,9 +150,6 @@ function network_init(App $a) {
 | 
			
		|||
		unset($_GET['nets']);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	$group_id = (($a->argc > 1 && is_numeric($a->argv[1])) ? intval($a->argv[1]) : 0);
 | 
			
		||||
 | 
			
		||||
	PConfig::set(local_user(), 'network.view', 'group.selected', $group_id);
 | 
			
		||||
 | 
			
		||||
	if (!x($a->page, 'aside')) {
 | 
			
		||||
		$a->page['aside'] = '';
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue