From 9d670d25f8bbab226f8ae6be48a8126f989f82b9 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@prodromou.name>
Date: Wed, 4 Jun 2008 15:12:06 -0400
Subject: [PATCH] fix passing request around

darcs-hash:20080604191206-84dde-24d6a80c9e3886352d451ca0993ed0bb6baafd7a.gz
---
 actions/userauthorization.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/actions/userauthorization.php b/actions/userauthorization.php
index 6a49af8258..a23b830b9a 100644
--- a/actions/userauthorization.php
+++ b/actions/userauthorization.php
@@ -37,12 +37,12 @@ class UserauthorizationAction extends Action {
 				if (!$req) {
 					# this must be a new request
 					$req = $this->get_new_request();
+					if (!$req) {
+						common_server_error(_t('No request found!'));
+					}
 					# XXX: only validate new requests, since nonce is one-time use
 					$this->validate_request($req);
 				}
-				if (!$req) {
-					common_server_error(_t('No request found!'));
-				}
 			} catch (OAuthException $e) {
 				$this->clear_request();
 				common_server_error($e->getMessage());
@@ -312,11 +312,12 @@ class UserauthorizationAction extends Action {
 
 	function get_new_request() {
 		$req = OAuthRequest::from_request();
+		return $req;
 	}
 	
 	# Throws an OAuthException if anything goes wrong
 	
-	function validate_request($req) {
+	function validate_request(&$req) {
 		# OAuth stuff -- have to copy from OAuth.php since they're
 		# all private methods, and there's no user-authentication method
 		$this->check_version($req);
@@ -397,7 +398,7 @@ class UserauthorizationAction extends Action {
 	
 	# Snagged from OAuthServer
 	
-	function check_version($req) {
+	function check_version(&$req) {
 		$version = $req->get_parameter("oauth_version");
 		if (!$version) {
 			$version = 1.0;