fixed
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				Build and push / Pulling repo on server (push) Successful in 3s
				
					
					
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	Build and push / Pulling repo on server (push) Successful in 3s
				This commit is contained in:
		@@ -54,9 +54,13 @@ class User extends Model {
 | 
				
			|||||||
            $u = new User();
 | 
					            $u = new User();
 | 
				
			||||||
            $u->load($id);
 | 
					            $u->load($id);
 | 
				
			||||||
            if($filtered===true)
 | 
					            if($filtered===true)
 | 
				
			||||||
                $users[$id] = $u->getDataFiltered();
 | 
					                $thisdata = $u->getDataFiltered();
 | 
				
			||||||
            else
 | 
					            else
 | 
				
			||||||
                $users[$id] = $u->data;
 | 
					                $thisdata = $u->data;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            $thisdata['id'] = $id;
 | 
				
			||||||
 | 
					            
 | 
				
			||||||
 | 
					            $users[] = $thisdata;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        return $users;
 | 
					        return $users;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,11 +16,11 @@ class Err extends Page {
 | 
				
			|||||||
        {
 | 
					        {
 | 
				
			||||||
            $u = new User();
 | 
					            $u = new User();
 | 
				
			||||||
            $allusers = $u->getAll(false);
 | 
					            $allusers = $u->getAll(false);
 | 
				
			||||||
            foreach($allusers as $userid => $user)
 | 
					            foreach($allusers as $user)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                if($user['token'] && $user['token'] == $_COOKIE['token'])
 | 
					                if($user['token'] && $user['token'] == $_COOKIE['token'])
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    $u->id = $userid;
 | 
					                    $u->id = $user['id'];
 | 
				
			||||||
                    break;
 | 
					                    break;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user