| Index: trunk/extensions/MetavidWiki/includes/MV_Settings.php |
| — | — | @@ -75,7 +75,7 @@ |
| 76 | 76 | // if we should load images from an external server: |
| 77 | 77 | $mvExternalImages = false; |
| 78 | 78 | // path to metavidWiki install that is serving images: |
| 79 | | -$mvExternalImgServerPath = 'http://mvprime.cse.ucsc.edu/wiki/index.php'; |
| | 79 | +$mvExternalImgServerPath = 'http://metavid.org/w/index.php'; |
| 80 | 80 | |
| 81 | 81 | $mvWebImgLoc = $mvgScriptPath . '/stream_images'; |
| 82 | 82 | // full local path for images (if hosted locally) |
| Index: trunk/extensions/MetavidWiki/includes/specials/MV_SpecialMediaSearch.php |
| — | — | @@ -976,7 +976,7 @@ |
| 977 | 977 | $result = $dbr->select( 'page', 'page_title', array ( |
| 978 | 978 | 'page_namespace' => NS_CATEGORY, |
| 979 | 979 | '`page_title` LIKE \'%' . mysql_escape_string( $val |
| 980 | | - ) . '%\' COLLATE utf8_bin' ), __METHOD__, array ( |
| | 980 | + ) . '%\' COLLATE latin1_swedish_ci' ), __METHOD__, array ( |
| 981 | 981 | 'LIMIT' => $result_limit |
| 982 | 982 | ) ); |
| 983 | 983 | $match_count = $dbr->numRows( $result ); |
| — | — | @@ -998,7 +998,7 @@ |
| 999 | 999 | $result = $dbr->select( 'categorylinks', 'cl_sortkey', array ( |
| 1000 | 1000 | 'cl_to' => $category, |
| 1001 | 1001 | '`cl_sortkey` LIKE \'%' . mysql_escape_string( $val |
| 1002 | | - ) . '%\' COLLATE utf8_bin' ), __METHOD__, array ( |
| | 1002 | + ) . '%\' COLLATE latin1_swedish_ci' ), __METHOD__, array ( |
| 1003 | 1003 | 'LIMIT' => $result_limit |
| 1004 | 1004 | ) ); |
| 1005 | 1005 | // print 'ran: ' . $dbr->lastQuery(); |
| — | — | @@ -1025,7 +1025,7 @@ |
| 1026 | 1026 | $result = $dbr->select( 'categorylinks', 'cl_sortkey', array ( |
| 1027 | 1027 | 'cl_to' => 'Person', |
| 1028 | 1028 | '`cl_sortkey` LIKE \'%' . mysql_escape_string( $val |
| 1029 | | - ) . '%\' COLLATE utf8_bin' ), __METHOD__, array ( |
| | 1029 | + ) . '%\' COLLATE latin1_swedish_ci' ), __METHOD__, array ( |
| 1030 | 1030 | 'LIMIT' => $result_limit |
| 1031 | 1031 | ) ); |
| 1032 | 1032 | $out = ''; |
| — | — | @@ -1160,4 +1160,4 @@ |
| 1161 | 1161 | $start_day |
| 1162 | 1162 | ), 'ed' => date( 'm/d/Y', $end_day ), 'sdays' => $sDays ), $obj_name ); |
| 1163 | 1163 | } |
| 1164 | | -} |
| | 1164 | +} |
| \ No newline at end of file |
| Index: trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_VideoPlayer.php |
| — | — | @@ -57,9 +57,9 @@ |
| 58 | 58 | $coma=', '; |
| 59 | 59 | } |
| 60 | 60 | $o.='</span>';*/ |
| 61 | | - $o .= '<span class="download"><a href="javascript:$j(\'#' . htmlspecialchars( $this->embed_id ) . '\').get(0).showVideoDownload()">Download Options</a></span>'; |
| | 61 | + $o .= '<span class="download"><a href="javascript:$j(\'#' . htmlspecialchars( $this->embed_id ) . '\').get(0).showDownload()">Download Options</a></span>'; |
| 62 | 62 | } |
| 63 | | - $o .= '<span class="embed"><a href="javascript:$j(\'#' . htmlspecialchars( $this->embed_id ) . '\').get(0).showEmbedCode();">Embed Video</a></span>' . |
| | 63 | + $o .= '<span class="embed"><a href="javascript:$j(\'#' . htmlspecialchars( $this->embed_id ) . '\').get(0).showShare();">Embed Video</a></span>' . |
| 64 | 64 | '</p>'; |
| 65 | 65 | // about file: |
| 66 | 66 | $talkPage = Title::newFromText( 'Anno_en:' . strtolower( $mvTitle->wiki_title ), MV_NS_MVD_TALK ); |
| Index: trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_EditPageAjax.php |
| — | — | @@ -217,7 +217,7 @@ |
| 218 | 218 | $this->showIntro(); |
| 219 | 219 | |
| 220 | 220 | if ( $this->mTitle->isTalkPage() ) { |
| 221 | | - $wgOut->addWikiText( wfMsg( 'talkpagetext' ) ); |
| | 221 | + $wgOut->addWikiMsg( 'talkpagetext' ); |
| 222 | 222 | } |
| 223 | 223 | |
| 224 | 224 | # Attempt submission here. This will check for edit conflicts, |
| Index: trunk/extensions/MetavidWiki/skins/mv_stream.js |
| — | — | @@ -348,7 +348,7 @@ |
| 349 | 349 | js_log('f:mv_doShowVideoDownload'); |
| 350 | 350 | //restores orginal state before showing download links: |
| 351 | 351 | mv_stream_interface.doRestore(); |
| 352 | | - return $j('#embed_vid').get(0).org_showVideoDownload(); |
| | 352 | + return $j('#embed_vid').get(0).org_showDownload(); |
| 353 | 353 | }*/ |
| 354 | 354 | /* the mvdObject |
| 355 | 355 | * |