| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -2106,7 +2106,7 @@ |
| 2107 | 2107 | } |
| 2108 | 2108 | |
| 2109 | 2109 | /** |
| 2110 | | - * @param $status Status |
| | 2110 | + * @param $status Status |
| 2111 | 2111 | */ |
| 2112 | 2112 | function error( $status ) { |
| 2113 | 2113 | global $wgOut; |
| Index: trunk/phase3/includes/parser/ParserCache.php |
| — | — | @@ -194,7 +194,6 @@ |
| 195 | 195 | * @param $parserOutput ParserOutput |
| 196 | 196 | * @param $article Article |
| 197 | 197 | * @param $popts ParserOptions |
| 198 | | - * @return void |
| 199 | 198 | */ |
| 200 | 199 | public function save( $parserOutput, $article, $popts ) { |
| 201 | 200 | $expire = $parserOutput->getCacheExpiry(); |
| Index: trunk/phase3/includes/WebRequest.php |
| — | — | @@ -160,11 +160,11 @@ |
| 161 | 161 | |
| 162 | 162 | return $proto . '://' . IP::combineHostAndPort( $host, $port, $stdPort ); |
| 163 | 163 | } |
| 164 | | - |
| | 164 | + |
| 165 | 165 | public static function detectProtocolAndStdPort() { |
| 166 | 166 | return ( isset( $_SERVER['HTTPS'] ) && $_SERVER['HTTPS'] == 'on' ) ? array( 'https', 443 ) : array( 'http', 80 ); |
| 167 | 167 | } |
| 168 | | - |
| | 168 | + |
| 169 | 169 | public static function detectProtocol() { |
| 170 | 170 | list( $proto, $stdPort ) = self::detectProtocolAndStdPort(); |
| 171 | 171 | return $proto; |
| — | — | @@ -520,7 +520,7 @@ |
| 521 | 521 | * @return Boolean |
| 522 | 522 | */ |
| 523 | 523 | public function wasPosted() { |
| 524 | | - return $_SERVER['REQUEST_METHOD'] == 'POST'; |
| | 524 | + return isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] == 'POST'; |
| 525 | 525 | } |
| 526 | 526 | |
| 527 | 527 | /** |
| — | — | @@ -597,7 +597,7 @@ |
| 598 | 598 | * Return the request URI with the canonical service and hostname, path, |
| 599 | 599 | * and query string. This will be suitable for use as an absolute link |
| 600 | 600 | * in HTML or other output. |
| 601 | | - * |
| | 601 | + * |
| 602 | 602 | * NOTE: This will output a protocol-relative URL if $wgServer is protocol-relative |
| 603 | 603 | * |
| 604 | 604 | * @return String |