Quam Plures

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

  1. fix_vimeo_issue
  2. Merge into trunk
Proposed by EdB
Status: Merged
Approved by: Tilman Blumenbach
Approved revision: 7448
Merged at revision: not available
Proposed branch: lp:~quam-plures-core/quam-plures/fix_vimeo_issue
Merge into: lp:quam-plures
Diff against target: 37 lines (+3/-3)
3 files modified
install/_functions_install.php (+1/-1)
plugins/video_plugin/video_modules/_theonion.vp.php (+1/-1)
plugins/video_plugin/video_modules/_vimeo.vp.php (+1/-1)
To merge this branch: bzr merge lp:~quam-plures-core/quam-plures/fix_vimeo_issue
Reviewer Review Type Date Requested Status
Tilman Blumenbach Pending
Review via email: mp+21748@code.launchpad.net

Description of the change

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 !

To post a comment you must log in.
lp:~quam-plures-core/quam-plures/fix_vimeo_issue updated
7448. By EdB

implementating qp-bug-543480

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'install/_functions_install.php'
2--- install/_functions_install.php 2010-03-12 16:43:42 +0000
3+++ install/_functions_install.php 2010-03-22 04:43:25 +0000
4@@ -427,7 +427,7 @@
5 install_plugin( 'auto_p_plugin' );
6 install_plugin( 'texturize_plugin' );
7 install_plugin( 'smilies_plugin' );
8- install_plugin( 'videoplug_plugin' );
9+ install_plugin( 'video_plugin' );
10 // TemplateTags:
11 install_plugin( 'calendar_plugin' );
12 install_plugin( 'archives_plugin' );
13
14=== modified file 'plugins/video_plugin/video_modules/_theonion.vp.php'
15--- plugins/video_plugin/video_modules/_theonion.vp.php 2010-03-16 14:39:04 +0000
16+++ plugins/video_plugin/video_modules/_theonion.vp.php 2010-03-22 04:43:25 +0000
17@@ -1,6 +1,6 @@
18 <?php
19 /**
20- * This file implements the TheOnion Video class of the VideoPlug plugin for Quam Plures
21+ * This file implements the TheOnion Video class of the video plugin for Quam Plures
22 *
23 * Quam Plures - {@link http://quamplures.net/}
24 * Released under GNU GPL License - {@link http://quamplures.net/license.html}
25
26=== modified file 'plugins/video_plugin/video_modules/_vimeo.vp.php'
27--- plugins/video_plugin/video_modules/_vimeo.vp.php 2010-03-18 14:46:33 +0000
28+++ plugins/video_plugin/video_modules/_vimeo.vp.php 2010-03-22 04:43:25 +0000
29@@ -135,7 +135,7 @@
30 $extras .= '&color=FFFFFF';
31 break;
32 }
33- $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 );
34+ $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 );
35
36 //@todo yabs > tidy this up
37 $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 );

Subscribers

People subscribed via source and target branches