From d87d9d96b2de67480084f0626986dadaeeda7806 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 11 Mar 2010 15:42:24 +0100
Subject: [PATCH] [feature/request-class] request_var should return after
 setting the request object.

If the "dependency injection" mechanism is used there should not be any regular
computation of a result value. request_var has to return immediately.

PHPBB3-9716
---
 phpBB/includes/functions.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 485f5487cc..d5132d218e 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -49,6 +49,7 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false)
 	if ($var_name instanceof phpbb_request_interface)
 	{
 		$request = $var_name;
+		return;
 	}
 
 	// no request class set, create a temporary one ourselves to keep backwards compatability