| Index: trunk/extensions/MetavidWiki/includes/MV_StreamImage.php |
| — | — | @@ -104,6 +104,10 @@ |
| 105 | 105 | } |
| 106 | 106 | } |
| 107 | 107 | function getStreamImageRaw( $stream_id, $req_time = null, $req_size = null ) { |
| | 108 | + //set out a long expire: |
| | 109 | + //keep in the cache for a 90 days: |
| | 110 | + header('Expires: ' . gmdate('D, d M Y H:i:s', time()+90*24*60*60) . ' GMT'); |
| | 111 | + |
| 108 | 112 | // print "get raw img\n"; |
| 109 | 113 | $req_time = MV_StreamImage::procRequestTime( $stream_id, $req_time ); |
| 110 | 114 | list( $im_width, $im_height, $ext ) = MV_StreamImage::getSizeType( $req_size ); |
| — | — | @@ -114,10 +118,7 @@ |
| 115 | 119 | $img_path = MV_StreamImage::getLocalImagePath( $stream_id, $req_time, $req_size ); |
| 116 | 120 | list( $im_width, $im_height, $ext ) = MV_StreamImage::getSizeType( $req_size ); |
| 117 | 121 | if ( $ext == 'jpg' )header( "Content-type: image/jpeg" ); |
| 118 | | - if ( $ext == 'png' )header( "Content-type: image/png" ); |
| 119 | | - //set out a long expire: |
| 120 | | - //keep in the cache for a 90 days: |
| 121 | | - header('Expires: ' . gmdate('D, d M Y H:i:s', time()+90*24*60*60) . ' GMT'); |
| | 122 | + if ( $ext == 'png' )header( "Content-type: image/png" ); |
| 122 | 123 | // print "img path: $img_path"; |
| 123 | 124 | // @@todo a redirect to real image (will serv from cache that way) |
| 124 | 125 | if ( is_file( $img_path ) ) { |
| Index: trunk/extensions/MetavidWiki/includes/MV_Index.php |
| — | — | @@ -108,7 +108,9 @@ |
| 109 | 109 | if ( $dbr->numRows( $result ) == 0 )return array(); |
| 110 | 110 | |
| 111 | 111 | $do_cat_lookup = $do_smw_lookup = false; |
| 112 | | - $smw_properties = explode( ',', $smw_properties ); |
| | 112 | + if( !is_array($smw_properties) ){ |
| | 113 | + $smw_properties = explode( ',', $smw_properties ); |
| | 114 | + } |
| 113 | 115 | foreach($smw_properties as $propKey){ |
| 114 | 116 | if($propKey == 'category') |
| 115 | 117 | $do_cat_lookup=true; |
| Index: trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_Navigator.php |
| — | — | @@ -50,6 +50,7 @@ |
| 51 | 51 | $options = array( 'LIMIT' => 1, 'ORDER BY' => $orderby ) |
| 52 | 52 | ); |
| 53 | 53 | //print $dbr->lastQuery(); |
| | 54 | + //print_r($mvd_rows); |
| 54 | 55 | //die; |
| 55 | 56 | // print "SHOULD GET $pntype for $stream_time_req"; |
| 56 | 57 | reset( $mvd_rows ); |
| — | — | @@ -78,7 +79,6 @@ |
| 79 | 80 | } |
| 80 | 81 | } |
| 81 | 82 | } |
| 82 | | - |
| 83 | 83 | return $o; |
| 84 | 84 | } |
| 85 | 85 | function render_full() { |
| Index: trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js |
| — | — | @@ -22,7 +22,7 @@ |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | //used to grab fresh copies of scripts. (should be changed on commit) |
| 26 | | -var MV_EMBED_VERSION = '1.0r11'; |
| | 26 | +var MV_EMBED_VERSION = '1.0r12'; |
| 27 | 27 | |
| 28 | 28 | //if we should use the scriptLoader |
| 29 | 29 | //( lets you group requests, minimize javascript, and use mediaWiki localization infrastructure) |