| Index: trunk/extensions/MetavidWiki/includes/specials/MV_SpecialExport.php |
| — | — | @@ -152,7 +152,7 @@ |
| 153 | 153 | } |
| 154 | 154 | //start high level: |
| 155 | 155 | function get_roe_xml($header=true){ |
| 156 | | - global $mvDefaultVideoQualityKey; |
| | 156 | + global $mvDefaultVideoQualityKey, $wgServer; |
| 157 | 157 | $dbr =& wfGetDB(DB_SLAVE); |
| 158 | 158 | |
| 159 | 159 | $this->get_row_data(); |
| — | — | @@ -166,7 +166,7 @@ |
| 167 | 167 | <ROE> |
| 168 | 168 | <head> |
| 169 | 169 | <link id="html_linkback" rel="alternate" type="text/html" href="<?=htmlentities($this->streamPageTitle->getFullURL() )?>" /> |
| 170 | | - <img id="stream_thumb" src="<?=htmlentities($this->mvTitle->getStreamImageURL())?>"/> |
| | 170 | + <img id="stream_thumb" src="<?=htmlentities($this->mvTitle->getFullStreamImageURL())?>"/> |
| 171 | 171 | <title><?=htmlentities($this->mvTitle->getTitleDesc())?></title> |
| 172 | 172 | </head> |
| 173 | 173 | <body> |
| — | — | @@ -247,7 +247,7 @@ |
| 248 | 248 | if(!isset($tracks[$mvd->mvd_type]))$tracks[$mvd->mvd_type]=''; |
| 249 | 249 | $tracks[$mvd->mvd_type].=' |
| 250 | 250 | <'.$ns.'clip id="mvd_'.$mvd->id.'" start="ntp:'.seconds2ntp($mvd->start_time).'" end="ntp:'.seconds2ntp($mvd->end_time).'"> |
| 251 | | - <'.$ns.'img src="'.htmlentities($streamTitle->getStreamImageURL(null, seconds2ntp($mvd->start_time))).'"/> |
| | 251 | + <'.$ns.'img src="'.htmlentities($streamTitle->getFullStreamImageURL(null, seconds2ntp($mvd->start_time))).'"/> |
| 252 | 252 | <'.$ns.'body><![CDATA[ |
| 253 | 253 | '. $MV_Overlay->getMVDhtml($mvd, $absolute_links=true).' |
| 254 | 254 | ]]></'.$ns.'body> |
| Index: trunk/extensions/MetavidWiki/includes/MV_Title.php |
| — | — | @@ -195,8 +195,19 @@ |
| 196 | 196 | return ''; |
| 197 | 197 | } |
| 198 | 198 | } |
| | 199 | + function getFullStreamImageURL($size=null, $req_time=null, $foce_server=''){ |
| | 200 | + global $wgServer,$mvExternalImages; |
| | 201 | + //if using external images already: |
| | 202 | + if($mvExternalImages){ |
| | 203 | + return $this->getStreamImageURL($size, $req_time, $foce_server); |
| | 204 | + }else{ |
| | 205 | + global $wgServer; |
| | 206 | + return $wgServer.$this->getStreamImageURL($size, $req_time, $foce_server); |
| | 207 | + } |
| | 208 | + } |
| | 209 | + //@@todo force_server is a weird hack ... @@todo remove and update other code locations |
| 199 | 210 | function getStreamImageURL($size=null, $req_time=null, $foce_server=''){ |
| 200 | | - global $mvImageArchive, $mvDefaultVideoPlaybackRes; |
| | 211 | + global $mvDefaultVideoPlaybackRes; |
| 201 | 212 | if($size==null)$size = $mvDefaultVideoPlaybackRes; |
| 202 | 213 | if($req_time==null){ |
| 203 | 214 | $req_time = $this->getStartTime(); |