| Index: trunk/extensions/OpenID/SpecialOpenIDServer.body.php |
| — | — | @@ -66,7 +66,9 @@ |
| 67 | 67 | return; |
| 68 | 68 | } |
| 69 | 69 | |
| | 70 | + wfSuppressWarnings(); |
| 70 | 71 | $server =& $this->getServer(); |
| | 72 | + wfRestoreWarnings(); |
| 71 | 73 | |
| 72 | 74 | switch ( $par ) { |
| 73 | 75 | case 'Login': |
| — | — | @@ -109,7 +111,10 @@ |
| 110 | 112 | $query = $_POST; |
| 111 | 113 | } |
| 112 | 114 | |
| | 115 | + wfSuppressWarnings(); |
| 113 | 116 | $request = $server->decodeRequest(); |
| | 117 | + wfRestoreWarnings(); |
| | 118 | + |
| 114 | 119 | $sreg = $this->SregFromQuery( $query ); |
| 115 | 120 | $response = NULL; |
| 116 | 121 | break; |
| — | — | @@ -133,7 +138,9 @@ |
| 134 | 139 | break; |
| 135 | 140 | default: |
| 136 | 141 | # For all the other parts, just let the libs do it |
| | 142 | + wfSuppressWarnings(); |
| 137 | 143 | $response =& $server->handleRequest( $request ); |
| | 144 | + wfRestoreWarnings(); |
| 138 | 145 | } |
| 139 | 146 | |
| 140 | 147 | # OpenIDServerCheck returns NULL if some output (like a form) |
| — | — | @@ -317,7 +324,9 @@ |
| 318 | 325 | $response_fields = array_intersect( array_unique( array_merge( $sreg['required'], $sreg['optional'] ) ), |
| 319 | 326 | $trust ); |
| 320 | 327 | |
| | 328 | + wfSuppressWarnings(); |
| 321 | 329 | $response = $request->answer( true ); |
| | 330 | + wfRestoreWarnings(); |
| 322 | 331 | |
| 323 | 332 | assert( isset( $response ) ); |
| 324 | 333 | |
| — | — | @@ -481,7 +490,9 @@ |
| 482 | 491 | |
| 483 | 492 | $wgOut->disable(); |
| 484 | 493 | |
| | 494 | + wfSuppressWarnings(); |
| 485 | 495 | $wr =& $server->encodeResponse( $response ); |
| | 496 | + wfRestoreWarnings(); |
| 486 | 497 | |
| 487 | 498 | assert( !is_null( $wr ) ); |
| 488 | 499 | |
| — | — | @@ -552,7 +563,6 @@ |
| 553 | 564 | } |
| 554 | 565 | |
| 555 | 566 | function serverLogin( $request ) { |
| 556 | | - |
| 557 | 567 | global $wgRequest, $wgUser; |
| 558 | 568 | |
| 559 | 569 | assert( isset( $request ) ); |
| Index: trunk/extensions/OpenID/SpecialOpenID.body.php |
| — | — | @@ -180,6 +180,7 @@ |
| 181 | 181 | $consumer = $this->getConsumer(); |
| 182 | 182 | |
| 183 | 183 | if ( !$consumer ) { |
| | 184 | + wfDebug( "OpenID: no consumer\n" ); |
| 184 | 185 | $wgOut->showErrorPage( 'openiderror', 'openiderrortext' ); |
| 185 | 186 | return; |
| 186 | 187 | } |
| — | — | @@ -191,6 +192,7 @@ |
| 192 | 193 | |
| 193 | 194 | // Handle failure status return values. |
| 194 | 195 | if ( !$auth_request ) { |
| | 196 | + wfDebug( "OpenID: no auth_request\n" ); |
| 195 | 197 | $wgOut->showErrorPage( 'openiderror', 'openiderrortext' ); |
| 196 | 198 | return; |
| 197 | 199 | } |