Merge lp:~quam-plures-core/quam-plures/fix_vimeo_issue into lp:quam-plures

[EdB]

Fixed vimeo so that it renders. Problem was it had a space between W:NNN and X:NNN but did not look for that space when rendering. Solution was to add a space ;) Also replaced 'videoplug' with 'video' in the installer, and replaced a reference to videoplug in 'theonion' video file thing.

And tested it - actually saw it render a vimeo video on localhost !

[lp:~quam-plures-core/quam-plures/fix_vimeo_issue]

7448. By EdB on 2010-03-22

implementating qp-bug-543480

=== modified file 'install/_functions_install.php'
--- install/_functions_install.php	2010-03-12 16:43:42 +0000
+++ install/_functions_install.php	2010-03-22 04:43:25 +0000
@@ -427,7 +427,7 @@
 		install_plugin( 'auto_p_plugin' );
 		install_plugin( 'texturize_plugin' );
 		install_plugin( 'smilies_plugin' );
-		install_plugin( 'videoplug_plugin' );
+		install_plugin( 'video_plugin' );
 		// TemplateTags:
 		install_plugin( 'calendar_plugin' );
 		install_plugin( 'archives_plugin' );
 
=== modified file 'plugins/video_plugin/video_modules/_theonion.vp.php'
--- plugins/video_plugin/video_modules/_theonion.vp.php	2010-03-16 14:39:04 +0000
+++ plugins/video_plugin/video_modules/_theonion.vp.php	2010-03-22 04:43:25 +0000
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file implements the TheOnion Video class of the VideoPlug plugin for Quam Plures
+ * This file implements the TheOnion Video class of the video plugin for Quam Plures
  *
  * Quam Plures - {@link http://quamplures.net/}
  * Released under GNU GPL License - {@link http://quamplures.net/license.html}
 
=== modified file 'plugins/video_plugin/video_modules/_vimeo.vp.php'
--- plugins/video_plugin/video_modules/_vimeo.vp.php	2010-03-18 14:46:33 +0000
+++ plugins/video_plugin/video_modules/_vimeo.vp.php	2010-03-22 04:43:25 +0000
@@ -135,7 +135,7 @@
 				$extras .= '&color=FFFFFF';
 				break;
 				}
-			$content = preg_replace( '#\[video:vimeo:(.+?) w:(.+?)h:(.+?)]#', '<div class="videoblock"><object type="application/x-shockwave-flash" data="http://www.vimeo.com/moogaloop.swf?clip_id=\\1'.$extras.'" [vimeoscale:\\2:\\3]><param name="movie" value="http://www.vimeo.com/moogaloop.swf?clip_id=\\1'.$extras.'" /><param name="allowfullscreen" value="true" /><param name="wmode" value="transparent" /></object></div>', $content );
+			$content = preg_replace( '#\[video:vimeo:(.+?) w:(.+?) h:(.+?)]#', '<div class="videoblock"><object type="application/x-shockwave-flash" data="http://www.vimeo.com/moogaloop.swf?clip_id=\\1'.$extras.'" [vimeoscale:\\2:\\3]><param name="movie" value="http://www.vimeo.com/moogaloop.swf?clip_id=\\1'.$extras.'" /><param name="allowfullscreen" value="true" /><param name="wmode" value="transparent" /></object></div>', $content );
 
 			//@todo yabs > tidy this up
 			$content = preg_replace( '#\[video:vimeo:(.+?)]#', '<div class="videoblock"><object type="application/x-shockwave-flash" data="http://www.vimeo.com/moogaloop.swf?clip_id=$1'.$extras.'" [vimeoscale:400:225]><param name="movie" value="http://www.vimeo.com/moogaloop.swf?clip_id=\\1'.$extras.'" /><param name="allowfullscreen" value="true" /><param name="wmode" value="transparent" /></object></div>', $content );