mirror of
				https://github.com/getgrav/grav-plugin-admin.git
				synced 2025-11-03 20:05:53 +01:00 
			
		
		
		
	Fixed Admin::redirect() check for /admin, /en/admin, /root/admin or /root/en/admin
This commit is contained in:
		@@ -369,7 +369,7 @@ class Admin
 | 
				
			|||||||
            $root = '';
 | 
					            $root = '';
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        $pattern = '|^((' . preg_quote($root, '|') . ')?\/[\w\d_-]+)' . preg_quote($base, '|') . '|ui';
 | 
					        $pattern = '`^((' . preg_quote($root, '`') . ')?(/[^/]+)?)' . preg_quote($base, '`') . '`ui';
 | 
				
			||||||
        // Check if we already have an admin path: /admin, /en/admin, /root/admin or /root/en/admin.
 | 
					        // Check if we already have an admin path: /admin, /en/admin, /root/admin or /root/en/admin.
 | 
				
			||||||
        if (preg_match($pattern, $redirect)) {
 | 
					        if (preg_match($pattern, $redirect)) {
 | 
				
			||||||
            $redirect = preg_replace('|^' . preg_quote($root, '|') . '|', '', $redirect);
 | 
					            $redirect = preg_replace('|^' . preg_quote($root, '|') . '|', '', $redirect);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user