Merge pull request #6 from rafi/3.1/develop

3.1/develop
kohana · Jun 14, 2011 · 1bf8c31 · 1bf8c31
2 parents f7e384e + 253111a
commit 1bf8c31
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/classes/controller/demo/oauth.php b/classes/controller/demo/oauth.php
@@ -67,7 +67,7 @@ public function demo_login()
 				$this->session->delete($this->key('request'));
 
 				// Restart the login process
-				$this->request->redirect($this->request->uri);
+				$this->request->redirect($this->request->uri());
 			}
 
 			// Store the verifier in the token
@@ -124,7 +124,7 @@ public function demo_logout()
 			$this->request->redirect($this->request->uri(array('action' => FALSE, 'id' => FALSE)));
 		}
 
-		$this->content = HTML::anchor("{$this->request->uri}?confirm=yes", "Logout of {$this->api}");
+		$this->content = HTML::anchor("{$this->request->uri()}?confirm=yes", "Logout of {$this->api}");
 	}
 
 } // End Demo
diff --git a/views/demo/oauth/index.php b/views/demo/oauth/index.php
@@ -1,4 +1,4 @@
-<h2>OAuth Demo</h3>
+<h2>OAuth Demo</h2>
 
 <p>This demo makes use of the <a href="https://github.com/kohana/oauth">OAuth Module</a> for <a href="http://kohanaframework.org/">Kohana.</a>