| Index: trunk/phase3/includes/specials/SpecialUpload.php |
| — | — | @@ -39,7 +39,7 @@ |
| 40 | 40 | |
| 41 | 41 | protected function initForm() { |
| 42 | 42 | global $wgRequest, $wgUser; |
| 43 | | - |
| | 43 | + |
| 44 | 44 | if ( is_null( $this->mRequest ) ) { |
| 45 | 45 | $request = $wgRequest; |
| 46 | 46 | } else { |
| — | — | @@ -96,7 +96,7 @@ |
| 97 | 97 | |
| 98 | 98 | $this->setHeaders(); |
| 99 | 99 | $this->outputHeader(); |
| 100 | | - |
| | 100 | + |
| 101 | 101 | $this->initForm(); |
| 102 | 102 | |
| 103 | 103 | # Check uploading enabled |
| — | — | @@ -606,7 +606,7 @@ |
| 607 | 607 | $wgOut->addHTML( |
| 608 | 608 | Xml::openElement( 'form', array( 'method' => 'post', 'action' => $titleObj->getLocalURL( 'action=submit' ), |
| 609 | 609 | 'enctype' => 'multipart/form-data', 'id' => 'uploadwarning' ) ) . "\n" . |
| 610 | | - Xml::hidden('wpEditToken', $wgUser->editToken()) . |
| | 610 | + Xml::hidden('wpEditToken', $wgUser->editToken(), array("id" => 'wpEditToken')) . |
| 611 | 611 | Xml::hidden( 'wpIgnoreWarning', '1' ) . "\n" . |
| 612 | 612 | Xml::hidden( 'wpSourceType', 'stash' ) . "\n" . |
| 613 | 613 | Xml::hidden( 'wpSessionKey', $this->mSessionKey ) . "\n" . |
| — | — | @@ -833,7 +833,7 @@ |
| 834 | 834 | $wgOut->addHTML( |
| 835 | 835 | Xml::openElement( 'form', array( 'method' => 'post', 'action' => $titleObj->getLocalURL( 'action=submit' ), |
| 836 | 836 | 'enctype' => 'multipart/form-data', 'id' => 'mw-upload-form' ) ) . |
| 837 | | - Xml::hidden('wpEditToken', $wgUser->editToken()) . |
| | 837 | + Xml::hidden('wpEditToken', $wgUser->editToken(), array('id' => 'wpEditToken')) . |
| 838 | 838 | Xml::openElement( 'fieldset' ) . |
| 839 | 839 | Xml::element( 'legend', null, wfMsg( 'upload' ) ) . |
| 840 | 840 | Xml::openElement( 'table', array( 'border' => '0', 'id' => 'mw-upload-table' ) ) . |
| Index: trunk/phase3/js2/mwEmbed/libAddMedia/mvFirefogg.js |
| — | — | @@ -19,7 +19,7 @@ |
| 20 | 20 | |
| 21 | 21 | }); |
| 22 | 22 | |
| 23 | | -var firefogg_install_inks = { |
| | 23 | +var firefogg_install_links = { |
| 24 | 24 | 'macosx': 'http://firefogg.org/macosx/Firefogg.xpi', |
| 25 | 25 | 'win32' : 'http://firefogg.org/win32/Firefogg.xpi', |
| 26 | 26 | 'linux' : 'http://firefogg.org/linux/Firefogg.xpi' |
| Index: trunk/phase3/js2/mwEmbed/mv_embed.js |
| — | — | @@ -62,7 +62,7 @@ |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | //setup the skin path: |
| 66 | | -var mv_jquery_skin_path = mv_embed_path + 'jquery/jquery.ui/themes/base/'; |
| | 66 | +var mv_jquery_skin_path = mv_embed_path + 'jquery/jquery.ui/themes/redmond/'; |
| 67 | 67 | var mv_skin_img_path = mv_embed_path + 'skins/' + mwConfig['skin_name'] + '/images/'; |
| 68 | 68 | var mv_default_thumb_url = mv_skin_img_path + 'vid_default_thumb.jpg'; |
| 69 | 69 | |