Revision: 48554
Author: dale
Date: 2009-03-19 00:18:53 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
a few bug fixes
Modified Paths:
--------------
trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Navigator.php
trunk/extensions/MetavidWiki/includes/specials/MV_SpecialExport.php
trunk/extensions/MetavidWiki/skins/mv_embed/flvServer/FLV/Util/AMFSerialize.php
trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js
Modified:
trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Navigator.php
===================================================================
--- trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Navigator.php
2009-03-19 00:18:03 UTC (rev 48553)
+++ trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Navigator.php
2009-03-19 00:18:53 UTC (rev 48554)
@@ -59,20 +59,22 @@
$stime_req = seconds2ntp( $row->start_time ) .
'/' . seconds2ntp( $row->end_time );
$streamTitle = Title::newFromText( $stream_name
. '/' . $stime_req, MV_NS_STREAM );
$tool_tip = '';
- // print_r($row);
- if ( trim( $row->Speech_by ) != '' ) {
- //check if the person has an icon:
- $pimg = mv_get_person_img(
$row->Speech_by );
- $o .= wfMsg( 'mv_' . $pntype .
'_speech', $sk->makeKnownLinkObj( $streamTitle, '<img
title="'.str_replace('_',' ',$row->Speech_by).'" width="40" src="' .
$pimg->getURL() . '">' ) );
- //$o .= wfMsg( 'mv_' . $pntype .
'_speech', $sk->makeKnownLinkObj( $streamTitle, str_replace( '_', ' ',
$row->Speech_by ) ) );
-
-
- // $tool_tip.= 'Speech By: '.
$row->Speech_by;
- } else if ( trim( $row->Bill ) != '' ) {
- $o .= wfMsg( 'mv_' . $pntype . '_bill',
$sk->makeKnownLinkObj( $streamTitle, str_replace( '_', ' ', $row->Bill ) ) );
- } else if ( is_array( $row->category ) &&
count( $row->category ) != 0 ) {
- $first_cat = current( $row->category );
- $o .= wfMsg( 'mv_' . $pntype . '_cat',
$sk->makeKnownLinkObj( $streamTitle, str_replace( '_', ' ', $first_cat ) ) );
+ // print_r($row);
+ if(isset($row->Speech_by)){
+ if ( trim( $row->Speech_by ) != '' ) {
+ //check if the person has an
icon:
+ $pimg = mv_get_person_img(
$row->Speech_by );
+ $o .= wfMsg( 'mv_' . $pntype .
'_speech', $sk->makeKnownLinkObj( $streamTitle, '<img
title="'.str_replace('_',' ',$row->Speech_by).'" width="40" src="' .
$pimg->getURL() . '">' ) );
+ //$o .= wfMsg( 'mv_' . $pntype
. '_speech', $sk->makeKnownLinkObj( $streamTitle, str_replace( '_', ' ',
$row->Speech_by ) ) );
+
+
+ // $tool_tip.= 'Speech By: '.
$row->Speech_by;
+ } else if ( trim( $row->Bill ) != '' ) {
+ $o .= wfMsg( 'mv_' . $pntype .
'_bill', $sk->makeKnownLinkObj( $streamTitle, str_replace( '_', ' ', $row->Bill
) ) );
+ } else if ( is_array( $row->category )
&& count( $row->category ) != 0 ) {
+ $first_cat = current(
$row->category );
+ $o .= wfMsg( 'mv_' . $pntype .
'_cat', $sk->makeKnownLinkObj( $streamTitle, str_replace( '_', ' ', $first_cat
) ) );
+ }
}
}
}
Modified: trunk/extensions/MetavidWiki/includes/specials/MV_SpecialExport.php
===================================================================
--- trunk/extensions/MetavidWiki/includes/specials/MV_SpecialExport.php
2009-03-19 00:18:03 UTC (rev 48553)
+++ trunk/extensions/MetavidWiki/includes/specials/MV_SpecialExport.php
2009-03-19 00:18:53 UTC (rev 48554)
@@ -525,6 +525,7 @@
}
class mvRSSFeed extends ChannelFeed {
function outHeader( $set_content_type=true ) {
+ global $wgStyleVersion, $wgStylePath;
if( $set_content_type )
$this->httpHeaders();
@@ -642,7 +643,7 @@
<?php echo $desc_xml?>
</description>
<?php
-global $mvDefaultVideoQualityKey, $mvVidQualityMsgKeyType,
$mvDefaultVideoHighQualityKey;
+global $mvDefaultVideoQualityKey, $mvVidQualityMsgKeyType,
$mvDefaultVideoHighQualityKey, $mvDefaultFlashQualityKey;
//check a few different types in order of prefrence:
if( $stream_url = $mvTitle->getWebStreamURL($mvDefaultVideoHighQualityKey) ){
$mk = $mvDefaultVideoHighQualityKey;
Modified:
trunk/extensions/MetavidWiki/skins/mv_embed/flvServer/FLV/Util/AMFSerialize.php
===================================================================
---
trunk/extensions/MetavidWiki/skins/mv_embed/flvServer/FLV/Util/AMFSerialize.php
2009-03-19 00:18:03 UTC (rev 48553)
+++
trunk/extensions/MetavidWiki/skins/mv_embed/flvServer/FLV/Util/AMFSerialize.php
2009-03-19 00:18:53 UTC (rev 48554)
@@ -46,6 +46,7 @@
*/
function serialize( $var, $skipMark = false )
{
+ $number='';
// process objects as hashed arrays
if ( is_object( $var ) )
$var = (array)$var;
@@ -71,7 +72,6 @@
$data .= $this->serialize( $v );
}
} else {
-
$data = ( $skipMark ? '':"\x08" ) . pack( 'N', count( $var ) );
foreach ( $var as $k => $v )
{
@@ -94,7 +94,7 @@
return ( $skipMark ? '':"\x01" ) . ( $var ? "\x01" : "\x00" );
} else if ( is_numeric( $var ) ) {
-
+
$number .= pack( 'd', $var );
// reverse bytes if we are in little-endian hardware
Modified: trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js
===================================================================
--- trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js 2009-03-19
00:18:03 UTC (rev 48553)
+++ trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js 2009-03-19
00:18:53 UTC (rev 48554)
@@ -26,7 +26,7 @@
//if we should use the scriptLoader
//( lets you group requests, minimize javascript, and use mediaWiki
localization infrastructure)
-var MV_USE_SCRIPT_LOADER = false;
+var MV_USE_SCRIPT_LOADER = true;
//the name of the player skin (default is mvpcf)
var mv_skin_name = 'mvpcf';
@@ -243,10 +243,11 @@
last_class=i;
coma=',';
}
- }
+ }
+ var dbug_attr = (parseUri( getMvEmbedURL()
).queryKey['debug'])?'&debug=true':'';
this.libs[ last_class ] =
'mvwScriptLoader.php?class=' + class_set +
-
'&urid='+ getMvUniqueReqId()+
-
(parseUri( getMvEmbedURL() ).queryKey['debug'])?'&debug=true':'';
+
'&urid=' + getMvUniqueReqId() + dbug_attr;
+
}else{
//do many requests:
for(var i in libs){ //for in loop oky on object
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
