Revision: 48608
Author: dale
Date: 2009-03-19 19:32:23 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
export fix..
Modified Paths:
--------------
trunk/extensions/MetavidWiki/includes/MV_Title.php
trunk/extensions/MetavidWiki/includes/specials/MV_SpecialExport.php
trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js
Modified: trunk/extensions/MetavidWiki/includes/MV_Title.php
===================================================================
--- trunk/extensions/MetavidWiki/includes/MV_Title.php 2009-03-19 19:32:17 UTC
(rev 48607)
+++ trunk/extensions/MetavidWiki/includes/MV_Title.php 2009-03-19 19:32:23 UTC
(rev 48608)
@@ -44,8 +44,9 @@
// print "mv_title stream name: " . $this->stream_name. "\n";
}
function inheritTitle( & $title ) {
- if(!is_object($title))
- print_r( debug_backtrace() );
+ if( !is_object($title))
+ return false;
+ //print_r( debug_backtrace() );
foreach ( $title as $k => $v ) {
$this->$k = $v;
}
Modified: trunk/extensions/MetavidWiki/includes/specials/MV_SpecialExport.php
===================================================================
--- trunk/extensions/MetavidWiki/includes/specials/MV_SpecialExport.php
2009-03-19 19:32:17 UTC (rev 48607)
+++ trunk/extensions/MetavidWiki/includes/specials/MV_SpecialExport.php
2009-03-19 19:32:23 UTC (rev 48608)
@@ -580,41 +580,40 @@
if( $mvGetParentMeta && strtolower( $mvTitle->getMvdTypeKey() )
== 'ht_en'){
$pmvd = MV_Index::getParentAnnotativeLayers($mvTitle);
- $pMvTitle = new MV_Title( $pmvd->wiki_title );
- $pAnnoStreamTitle = Title :: MakeTitle( MV_NS_STREAM,
$pMvTitle->getNearStreamName( 0 ) );
-
- $parent_clip_desc = 'Parent Clip';
- if($pmvd->Speech_by){
- $personTitle = Title :: newFromText(
$pmvd->Speech_by );
- $parent_clip_desc = 'Speech By ' .
$personTitle->getText();
- }
- //append to the html output: should be merged with
getUnifiedResultsHTML stuff
- if( $pmvd->wiki_title ){
- $pMvTitle = new MV_Title(
$pmvd->wiki_title );
- $pAnnoStreamLink = Title :: MakeTitle(
MV_NS_STREAM, $pMvTitle->getNearStreamName( 0 ) );
- $clip_desc_txt = 'Segment';
- if($pmvd->Speech_by){
- $personTitle = Title ::
newFromText( $pmvd->Speech_by );
- $clip_desc_txt = 'Speech By ' .
$personTitle->getText();
- }
-
- $desc_html.='This clip is part of a '.
seconds2Description ( $pMvTitle->getSegmentDuration() ). ' ' .
-
$sk->makeKnownLinkObj($pAnnoStreamLink, $clip_desc_txt );
- if($pmvd->category){
- $desc_html.=' <br>Covering: ';
- $coma='';
- foreach($pmvd->category as
$cat_titlekey ){
- $cTitle = $cTitle =
Title :: MakeTitle( NS_CATEGORY, $cat_titlekey );
- $desc_html .= $coma .
$sk->makeKnownLinkObj( $cTitle, $cTitle->getText() );
- $coma=', ';
- }
+ if( $pmvd->wiki_title){
+ $pMvTitle = new MV_Title( $pmvd->wiki_title );
+ $pAnnoStreamTitle = Title :: MakeTitle(
MV_NS_STREAM, $pMvTitle->getNearStreamName( 0 ) );
+
+ $parent_clip_desc = 'Parent Clip';
+ if($pmvd->Speech_by){
+ $personTitle = Title :: newFromText(
$pmvd->Speech_by );
+ $parent_clip_desc = 'Speech By ' .
$personTitle->getText();
+ }
+ $pMvTitle = new MV_Title( $pmvd->wiki_title );
+ $pAnnoStreamLink = Title :: MakeTitle(
MV_NS_STREAM, $pMvTitle->getNearStreamName( 0 ) );
+ $clip_desc_txt = 'Segment';
+ if($pmvd->Speech_by){
+ $personTitle = Title :: newFromText(
$pmvd->Speech_by );
+ $clip_desc_txt = 'Speech By ' .
$personTitle->getText();
+ }
+
+ $desc_html.='This clip is part of a '.
seconds2Description ( $pMvTitle->getSegmentDuration() ). ' ' .
+ $sk->makeKnownLinkObj($pAnnoStreamLink,
$clip_desc_txt );
+ if($pmvd->category){
+ $desc_html.=' <br>Covering: ';
+ $coma='';
+ foreach($pmvd->category as
$cat_titlekey ){
+ $cTitle = $cTitle = Title ::
MakeTitle( NS_CATEGORY, $cat_titlekey );
+ $desc_html .= $coma .
$sk->makeKnownLinkObj( $cTitle, $cTitle->getText() );
+ $coma=', ';
}
- if($pmvd->Bill){
- $desc_html.=' <br>Bill: ';
- $bTitle = Title :: newFromText(
$pmvd->Bill );
- $desc_html .=
$sk->makeKnownLinkObj( $bTitle, $bTitle->getText() );
- }
- }
+ }
+ if($pmvd->Bill){
+ $desc_html.=' <br>Bill: ';
+ $bTitle = Title :: newFromText(
$pmvd->Bill );
+ $desc_html .= $sk->makeKnownLinkObj(
$bTitle, $bTitle->getText() );
+ }
+ }
}
Modified: trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js
===================================================================
--- trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js 2009-03-19
19:32:17 UTC (rev 48607)
+++ trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js 2009-03-19
19:32:23 UTC (rev 48608)
@@ -24,10 +24,6 @@
//used to grab fresh copies of scripts. (should be changed on commit)
var MV_EMBED_VERSION = '1.0r12';
-//if we should use the scriptLoader
-//( lets you group requests, minimize javascript, and use mediaWiki
localization infrastructure)
-var MV_USE_SCRIPT_LOADER = true;
-
//the name of the player skin (default is mvpcf)
var mv_skin_name = 'mvpcf';
@@ -232,7 +228,7 @@
return ;
}
//check if we should use the script loader to combine
all the requests into one:
- if( MV_USE_SCRIPT_LOADER ){
+ if( usingScriptLoaderCheck() ){
var class_set = '';
var last_class = '';
var coma = '';
@@ -1236,7 +1232,10 @@
e.rel = 'stylesheet';
document.getElementsByTagName("head")[0].appendChild(e);
}
-
+function usingScriptLoaderCheck(){
+ return ( getMvEmbedURL().indexOf('mvwScriptLoader.php') != -1
)?true:false;
+
+}
function getMvEmbedURL(){
js_elements = document.getElementsByTagName("script");
for(var i=0;i<js_elements.length; i++){
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
