r41824 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r41823‎ | r41824 | r41825 >
Date:22:18, 7 October 2008
Author:dale
Status:old
Tags:
Comment:
fixed missing wgScriptPath check
Modified paths:
  • /trunk/extensions/MetavidWiki/includes/MV_DefaultSettings.php (modified) (history)
  • /trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_MetavidInterface.php (modified) (history)
  • /trunk/extensions/MetavidWiki/skins/mv_allpages.js (modified) (history)

Diff [purge]

Index: trunk/extensions/MetavidWiki/includes/MV_DefaultSettings.php
@@ -129,6 +129,9 @@
130130 //The text Embed a metavid Stream inline in the wiki
131131 $mvEmbedKey = 'EmbedStream';
132132
 133+//wars people of archive inacuracys (given its a wiki and the source is close caption feed)
 134+$mvEnableStreamNotice=true;
 135+
133136 /*
134137 * All Available meta data layers
135138 * these type keys are used to allow multiple layers of metadata per stream.
Index: trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_MetavidInterface.php
@@ -64,7 +64,7 @@
6565 $this->page_title = wfMsg( 'mv_edit_sequence', $wgTitle->getText() );
6666 }
6767 function setupStreamView() {
68 - global $mvgIP, $mvDefaultStreamViewLength, $wgOut, $mvgScriptPath, $wgUser, $mvDispROEicon;
 68+ global $mvgIP, $mvDefaultStreamViewLength, $wgOut, $mvgScriptPath, $wgUser, $mvDispROEicon, $mvEnableStreamNotice;
6969
7070 // set default time range if null time range request
7171 $this->article->mvTitle->setStartEndIfEmpty();
@@ -101,10 +101,13 @@
102102 wfMsg( 'mv_of' ) . seconds2ntp( $this->article->mvTitle->getDuration() ) .
103103 '</h1>';
104104
105 - $wgOut->addWikiText( wfMsg('mv_warning_wiki'));
106 - $this->page_header.=$wgOut->getHTML();
107 - $wgOut->clearHTML();
 105+ if($mvEnableStreamNotice){
 106+ $wgOut->addWikiText( wfMsg('mv_warning_wiki'));
 107+ $this->page_header.=$wgOut->getHTML();
 108+ $wgOut->clearHTML();
 109+ }
108110
 111+
109112 // add export roe icon:
110113 if($mvDispROEicon){
111114 $this->page_header .= '<span id="cmml_link"/>';
Index: trunk/extensions/MetavidWiki/skins/mv_allpages.js
@@ -11,6 +11,9 @@
1212 if(typeof wgScript=='undefined')
1313 var wgScript = "/w/index.php";
1414
 15+if(typeof wgScriptPath=='undefined')
 16+ var wgScriptPath = '/w';
 17+
1518 var gMvd={};
1619 function mv_setup_allpage(){
1720 js_log("mv embed done loading now setup 'all page'");

Status & tagging log