| Index: trunk/extensions/TSPoll/TSPoll.php |
| — | — | @@ -57,21 +57,19 @@ |
| 58 | 58 | |
| 59 | 59 | function efTSPollRender( $input, $args, $parser ) { |
| 60 | 60 | |
| 61 | | - if ( isset( $args['id'] ) ) { |
| | 61 | + if ( isset( $args['id'] ) && $args['id'] != "" ) { |
| 62 | 62 | $id = wfUrlencode( $args['id'] ); |
| 63 | 63 | } else { |
| 64 | | - wfLoadExtensionMessages( 'TSPoll' ); |
| 65 | | - return wfMsgExt( 'tspoll-id-error', array( 'parse' ) ); |
| | 64 | + wfLoadExtensionMessages( 'TSPoll' ); |
| | 65 | + return wfMsg('tspoll-id-error'); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | | - // @todo Can't we just use the Http class? |
| 69 | 68 | $get_server = Http::get( 'http://toolserver.org/~jan/poll/dev/main.php?page=wiki_output&id='.$id ); |
| 70 | 69 | if( $get_server != '' ) { |
| 71 | 70 | return $get_server; |
| 72 | 71 | } |
| 73 | 72 | else { |
| 74 | 73 | wfLoadExtensionMessages( 'TSPoll' ); |
| 75 | | - // @todo: Should this be parsing before returning? |
| 76 | | - return wfMsgExt( 'tspoll-fetch-error', array( 'parse' ) ); |
| | 74 | + return wfMsg('tspoll-fetch-error'); |
| 77 | 75 | } |
| 78 | 76 | } |