From: Michael Dale <dale@users.mediawiki.org>
Date: Tue, 18 Aug 2009 19:45:54 +0000 (+0000)
Subject: * fixed SpecialUpload page iframe uploading for js2 (forgot to commit the SpecialUplo... 
X-Git-Tag: 1.31.0-rc.0~40243
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=132b192867f87dd77af21bff122c05195d4d75f0;p=lhc%2Fweb%2Fwiklou.git

* fixed SpecialUpload page iframe uploading for js2 (forgot to commit the SpecialUpload page that had the token id attr)
* fixed random error in mvFirefogg
* updated jquery skin path
---

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index ba05e6060f..6d9fd3bd82 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -39,7 +39,7 @@ class UploadForm extends SpecialPage {
 
 	protected function initForm() {
 		global $wgRequest, $wgUser;
-		
+
 		if ( is_null( $this->mRequest ) ) {
 			$request = $wgRequest;
 		} else {
@@ -96,7 +96,7 @@ class UploadForm extends SpecialPage {
 
 		$this->setHeaders();
 		$this->outputHeader();
-		
+
 		$this->initForm();
 
 		# Check uploading enabled
@@ -606,7 +606,7 @@ class UploadForm extends SpecialPage {
 		$wgOut->addHTML(
 			Xml::openElement( 'form', array( 'method' => 'post', 'action' => $titleObj->getLocalURL( 'action=submit' ),
 				 'enctype' => 'multipart/form-data', 'id' => 'uploadwarning' ) ) . "\n" .
-			Xml::hidden('wpEditToken', $wgUser->editToken()) .
+			Xml::hidden('wpEditToken', $wgUser->editToken(), array("id" => 'wpEditToken')) .
 			Xml::hidden( 'wpIgnoreWarning', '1' ) . "\n" .
 			Xml::hidden( 'wpSourceType', 'stash' ) . "\n" .
 			Xml::hidden( 'wpSessionKey', $this->mSessionKey ) . "\n" .
@@ -833,7 +833,7 @@ wgUploadAutoFill = {$autofill};
 		$wgOut->addHTML(
 			 Xml::openElement( 'form', array( 'method' => 'post', 'action' => $titleObj->getLocalURL( 'action=submit' ),
 				 'enctype' => 'multipart/form-data', 'id' => 'mw-upload-form' ) ) .
-			 Xml::hidden('wpEditToken', $wgUser->editToken()) .
+			 Xml::hidden('wpEditToken', $wgUser->editToken(), array('id' => 'wpEditToken')) .
 			 Xml::openElement( 'fieldset' ) .
 			 Xml::element( 'legend', null, wfMsg( 'upload' ) ) .
 			 Xml::openElement( 'table', array( 'border' => '0', 'id' => 'mw-upload-table' ) ) .
diff --git a/js2/mwEmbed/libAddMedia/mvFirefogg.js b/js2/mwEmbed/libAddMedia/mvFirefogg.js
index 1926df06c9..7dd518defd 100644
--- a/js2/mwEmbed/libAddMedia/mvFirefogg.js
+++ b/js2/mwEmbed/libAddMedia/mvFirefogg.js
@@ -19,7 +19,7 @@ loadGM({
 	
 });
 
-var firefogg_install_inks =  {
+var firefogg_install_links =  {
 	'macosx':	'http://firefogg.org/macosx/Firefogg.xpi',
 	'win32'	:	'http://firefogg.org/win32/Firefogg.xpi',
 	'linux' :	'http://firefogg.org/linux/Firefogg.xpi'
diff --git a/js2/mwEmbed/mv_embed.js b/js2/mwEmbed/mv_embed.js
index 68c56a484e..8011fdb889 100644
--- a/js2/mwEmbed/mv_embed.js
+++ b/js2/mwEmbed/mv_embed.js
@@ -62,7 +62,7 @@ if( !mv_embed_path ){
 }
 
 //setup the skin path: 
-var mv_jquery_skin_path = mv_embed_path + 'jquery/jquery.ui/themes/base/';
+var mv_jquery_skin_path = mv_embed_path + 'jquery/jquery.ui/themes/redmond/';
 var mv_skin_img_path = mv_embed_path + 'skins/' + mwConfig['skin_name'] + '/images/';
 var mv_default_thumb_url = mv_skin_img_path + 'vid_default_thumb.jpg';