Destination Check fixes

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 0cd6d1b..49bac54 100644 (file)
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -350,7 +350,7 @@ class UploadForm extends SpecialPage {
                        $warning .= '<li>' . wfMsgExt( 'fileexists', array('parseinline','replaceafter'), $dlink ) . '</li>' . $dlink2;
 
                } elseif( $existsType == 'page-exists' ) {
-                       $lnk = $sk->linkKnown( $file->getTitle(), '', 'redirect=no' );
+                       $lnk = $sk->linkKnown( $file->getTitle(), '', '',array('redirect'=>'no') );
                        $warning .= '<li>' . wfMsgExt( 'filepageexists', array( 'parseinline', 'replaceafter' ), $lnk ) . '</li>';
                } elseif ( $existsType == 'exists-normalized' ) {
                        # Check if image with lowercase extension exists.
@@ -818,13 +818,15 @@ wgUploadAutoFill = {$autofill};
                                "<input type='hidden' name='wpSourceType' value='file' />" ;
                        }
                }
-
-               if ( $useAjaxDestCheck ) {
+               $warningRow = '';
+               $destOnkeyup = '';
+               if($wgEnableJS2system){
                        $warningRow = "<tr><td colspan='2' id='wpDestFile-warning'>&nbsp;</td></tr>";
-                       $destOnkeyup = '';
-               } else {
-                       $warningRow = '';
-                       $destOnkeyup = '';
+               }else{
+                       if ( $useAjaxDestCheck ) {
+                               $warningRow = "<tr><td colspan='2' id='wpDestFile-warning'>&nbsp;</td></tr>";
+                               $destOnkeyup = 'onchange=\'wgUploadWarningObj.checkNow(this.value);\'';
+                       }
                }
                # Uploading a new version? If so, the name is fixed.
                $on = $this->mForReUpload ? "readonly='readonly'" : "";

diff --git a/js2/mwEmbed/README b/js2/mwEmbed/README
index 05d3219..8639659 100644 (file)
--- a/js2/mwEmbed/README
+++ b/js2/mwEmbed/README
@@ -1,15 +1,14 @@
 ***********************************************
 *
-* mwEmbed version 1.1
-* for details see: http://metavid.ucsc.edu/wiki/index.php/mwEmbed
+* mwEmbed version 1.2
+* for details see: http://www.mediawiki.org/wiki/MwEmbed
 * and this README
 *
 * All Metavid Wiki code is Released under the GPL2
 * for more info visit http:/metavid.ucsc.edu/code
 *
 * @author Michael Dale, 
-* @email dale@ucsc.edu
-* @url http://metavid.org
+* @email mdale@wikimedia.org
 *
 *********************************************
 

diff --git a/js2/uploadPage.js b/js2/uploadPage.js
index 46bf061..a374d9a 100644 (file)
--- a/js2/uploadPage.js
+++ b/js2/uploadPage.js
@@ -103,7 +103,8 @@ var mwUploadHelper = {
                        },
                        'url': _this.api_url
                },function(data){
-                       $j('#mw-spinner-wpDestFile').remove();
+                       //remove spinner:
+                       $j('#mw-spinner-wpDestFile').remove();                  
                        if(data && data.query && data.query.pages){
                                if( data.query.pages[-1] ){
                                        //all good no file there