Merge remote branch 'statusnet/0.8.x' into 0.9.x

Conflicts:
	EVENTS.txt
	actions/requesttoken.php
	classes/File.php
	install.php
	lib/action.php
	lib/noticeform.php

1 files changed, 1 insertions, 1 deletions

diff --git a/extlib/OAuth.php b/extlib/OAuth.php
index fd4853554..648627b57 100644
--- a/extlib/OAuth.php
+++ b/extlib/OAuth.php
@@ -327,7 +327,7 @@ class OAuthRequest {/*{{{*/
   public function get_normalized_http_url() {/*{{{*/
     $parts = parse_url($this->http_url);
 
-    $port = @$parts['port'];
+    $port = isset($parts['port']) ? $parts['port'] : null;
     $scheme = $parts['scheme'];
     $host = $parts['host'];
     $path = @$parts['path'];