| Index: trunk/phase3/includes/specials/SpecialUpload.php |
| — | — | @@ -350,7 +350,7 @@ |
| 351 | 351 | $warning .= '<li>' . wfMsgExt( 'fileexists', array('parseinline','replaceafter'), $dlink ) . '</li>' . $dlink2; |
| 352 | 352 | |
| 353 | 353 | } elseif( $existsType == 'page-exists' ) { |
| 354 | | - $lnk = $sk->linkKnown( $file->getTitle(), '', 'redirect=no' ); |
| | 354 | + $lnk = $sk->linkKnown( $file->getTitle(), '', '',array('redirect'=>'no') ); |
| 355 | 355 | $warning .= '<li>' . wfMsgExt( 'filepageexists', array( 'parseinline', 'replaceafter' ), $lnk ) . '</li>'; |
| 356 | 356 | } elseif ( $existsType == 'exists-normalized' ) { |
| 357 | 357 | # Check if image with lowercase extension exists. |
| — | — | @@ -818,13 +818,15 @@ |
| 819 | 819 | "<input type='hidden' name='wpSourceType' value='file' />" ; |
| 820 | 820 | } |
| 821 | 821 | } |
| 822 | | - |
| 823 | | - if ( $useAjaxDestCheck ) { |
| | 822 | + $warningRow = ''; |
| | 823 | + $destOnkeyup = ''; |
| | 824 | + if($wgEnableJS2system){ |
| 824 | 825 | $warningRow = "<tr><td colspan='2' id='wpDestFile-warning'> </td></tr>"; |
| 825 | | - $destOnkeyup = ''; |
| 826 | | - } else { |
| 827 | | - $warningRow = ''; |
| 828 | | - $destOnkeyup = ''; |
| | 826 | + }else{ |
| | 827 | + if ( $useAjaxDestCheck ) { |
| | 828 | + $warningRow = "<tr><td colspan='2' id='wpDestFile-warning'> </td></tr>"; |
| | 829 | + $destOnkeyup = 'onchange=\'wgUploadWarningObj.checkNow(this.value);\''; |
| | 830 | + } |
| 829 | 831 | } |
| 830 | 832 | # Uploading a new version? If so, the name is fixed. |
| 831 | 833 | $on = $this->mForReUpload ? "readonly='readonly'" : ""; |
| Index: trunk/phase3/js2/mwEmbed/README |
| — | — | @@ -1,15 +1,14 @@ |
| 2 | 2 | *********************************************** |
| 3 | 3 | * |
| 4 | | -* mwEmbed version 1.1 |
| 5 | | -* for details see: http://metavid.ucsc.edu/wiki/index.php/mwEmbed |
| | 4 | +* mwEmbed version 1.2 |
| | 5 | +* for details see: http://www.mediawiki.org/wiki/MwEmbed |
| 6 | 6 | * and this README |
| 7 | 7 | * |
| 8 | 8 | * All Metavid Wiki code is Released under the GPL2 |
| 9 | 9 | * for more info visit http:/metavid.ucsc.edu/code |
| 10 | 10 | * |
| 11 | 11 | * @author Michael Dale, |
| 12 | | -* @email dale@ucsc.edu |
| 13 | | -* @url http://metavid.org |
| | 12 | +* @email mdale@wikimedia.org |
| 14 | 13 | * |
| 15 | 14 | ********************************************* |
| 16 | 15 | |
| Index: trunk/phase3/js2/uploadPage.js |
| — | — | @@ -103,7 +103,8 @@ |
| 104 | 104 | }, |
| 105 | 105 | 'url': _this.api_url |
| 106 | 106 | },function(data){ |
| 107 | | - $j('#mw-spinner-wpDestFile').remove(); |
| | 107 | + //remove spinner: |
| | 108 | + $j('#mw-spinner-wpDestFile').remove(); |
| 108 | 109 | if(data && data.query && data.query.pages){ |
| 109 | 110 | if( data.query.pages[-1] ){ |
| 110 | 111 | //all good no file there |