| Index: branches/wmf/1.18wmf1/extensions/ApiSandbox/SpecialApiSandbox.php |
| — | — | @@ -32,7 +32,8 @@ |
| 33 | 33 | $out->addHTML( '<noscript>' . wfMessage( 'apisb-no-js' )->parse() . '</noscript> |
| 34 | 34 | <div id="api-sandbox-content" style="display: none">' ); |
| 35 | 35 | $out->addWikiMsg( 'apisb-intro' ); |
| 36 | | - $out->addHTML( $this->openFieldset( 'parameters' ) |
| | 36 | + $out->addHTML( '<form id="api-sandbox-form">' |
| | 37 | + . $this->openFieldset( 'parameters' ) |
| 37 | 38 | . $this->getInputs() |
| 38 | 39 | . '</fieldset>' |
| 39 | 40 | . $this->openFieldset( 'result' ) |
| — | — | @@ -48,7 +49,7 @@ |
| 49 | 50 | ' |
| 50 | 51 | . '<tr><td colspan="2"><div id="api-sandbox-output"></div></td></tr>' |
| 51 | 52 | . "\n</tbody></table>" |
| 52 | | - . "\n</fieldset>" ); |
| | 53 | + . "\n</fieldset>\n</form>" ); |
| 53 | 54 | |
| 54 | 55 | $out->addHTML( "\n</div>" ); # <div id="api-sandbox-content"> |
| 55 | 56 | } |
| — | — | @@ -103,7 +104,7 @@ |
| 104 | 105 | |
| 105 | 106 | $s .= Html::element( 'input', |
| 106 | 107 | array( |
| 107 | | - 'type' => 'button', |
| | 108 | + 'type' => 'submit', |
| 108 | 109 | 'id' => 'api-sandbox-submit', |
| 109 | 110 | 'value' => wfMessage( 'apisb-submit' )->text(), |
| 110 | 111 | 'disabled' => 'disabled', |
| Index: branches/wmf/1.18wmf1/extensions/ApiSandbox/ext.apiSandbox.js |
| — | — | @@ -225,7 +225,12 @@ |
| 226 | 226 | } |
| 227 | 227 | } ); |
| 228 | 228 | |
| 229 | | - $submit.click( function() { |
| | 229 | + |
| | 230 | + $( '#api-sandbox-form' ).submit( function( e ) { |
| | 231 | + e.preventDefault(); |
| | 232 | + if ( !$submit.is( ':enabled' ) ) { |
| | 233 | + return; |
| | 234 | + } |
| 230 | 235 | var url = mw.util.wikiScript( 'api' ) + '?action=' + $action.val(), |
| 231 | 236 | params = mainRequest.getRequestData(), |
| 232 | 237 | mustBePosted = isset( mainRequest.info.mustbeposted ); |
| Index: branches/wmf/1.18wmf1/extensions/ContactPage/SpecialContact.php |
| — | — | @@ -10,17 +10,11 @@ |
| 11 | 11 | * @license GNU General Public Licence 2.0 or later |
| 12 | 12 | */ |
| 13 | 13 | |
| 14 | | -if( !defined( 'MEDIAWIKI' ) ) { |
| 15 | | - echo( "not a valid entry point.\n" ); |
| 16 | | - die( 1 ); |
| 17 | | -} |
| 18 | | - |
| 19 | 14 | /** |
| 20 | 15 | * Provides the contact form |
| 21 | 16 | * @ingroup SpecialPage |
| 22 | 17 | */ |
| 23 | 18 | class SpecialContact extends SpecialPage { |
| 24 | | - |
| 25 | 19 | /** |
| 26 | 20 | * Constructor |
| 27 | 21 | */ |
| — | — | @@ -29,6 +23,13 @@ |
| 30 | 24 | } |
| 31 | 25 | |
| 32 | 26 | /** |
| | 27 | + * @see SpecialPage::getDescription |
| | 28 | + */ |
| | 29 | + function getDescription() { |
| | 30 | + return wfMsg( 'contactpage' ); |
| | 31 | + } |
| | 32 | + |
| | 33 | + /** |
| 33 | 34 | * Main execution function |
| 34 | 35 | * |
| 35 | 36 | * @param $par Mixed: Parameters passed to the page |
| Index: branches/wmf/1.18wmf1/extensions/ContactPage/ContactPage.i18n.php |
| — | — | @@ -15,7 +15,6 @@ |
| 16 | 16 | * @author Daniel Kinzler |
| 17 | 17 | */ |
| 18 | 18 | $messages['en'] = array( |
| 19 | | - 'contact' => 'Contact page', |
| 20 | 19 | 'contactpage' => 'Contact page', |
| 21 | 20 | 'contactpage-desc' => '[[Special:Contact|Contact form for visitors]]', |
| 22 | 21 | 'contactpage-title' => 'Contact', |
| Index: branches/wmf/1.18wmf1/extensions/PagedTiffHandler/PagedTiffHandler_body.php |
| — | — | @@ -351,15 +351,14 @@ |
| 352 | 352 | if ( ( $pagesize['width'] > $width ) && ( $pagesize['height'] > $height ) ) { |
| 353 | 353 | $xfac = $pagesize['width'] / $width; |
| 354 | 354 | $yfac = $pagesize['height'] / $height; |
| 355 | | - // tested in Linux and Windows |
| 356 | 355 | $cmd = wfEscapeShellArg( $wgTiffVipsCommand ); |
| 357 | | - $cmd .= ' im_shrink "' . wfEscapeShellArg( $srcPath ) . ':' . ( $page - 1 ) . '" '; |
| | 356 | + $cmd .= ' im_shrink ' . wfEscapeShellArg( $srcPath . ':' . ( $page - 1 ) ) . ' '; |
| 358 | 357 | $cmd .= wfEscapeShellArg( $dstPath ); |
| 359 | 358 | $cmd .= " {$xfac} {$yfac} 2>&1"; |
| 360 | 359 | } else { |
| 361 | | - // tested in Linux and Windows |
| 362 | 360 | $cmd = wfEscapeShellArg( $wgTiffVipsCommand ); |
| 363 | | - $cmd .= ' im_resize_linear "' . wfEscapeShellArg( $srcPath ) . ':' . ( $page - 1 ) . '" '; |
| | 361 | + $cmd .= ' im_resize_linear ' . wfEscapeShellArg( $srcPath . ':' . |
| | 362 | + ( $page - 1 ) ) . ' '; |
| 364 | 363 | $cmd .= wfEscapeShellArg( $dstPath ); |
| 365 | 364 | $cmd .= " {$width} {$height} 2>&1"; |
| 366 | 365 | } |
| Property changes on: branches/wmf/1.18wmf1/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 367 | 366 | Merged /trunk/extensions:r104971,105275,105902 |