Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
],
"require": {
"php": ">=7.1.3",
"composer/installers": "~1.0"
"composer/installers": "^1.0 || ^2.0"
},
"require-dev": {
"phing/phing": "~2.4"
},
"extra": {
"display-name": "phpBB Media Embed PlugIn",
"soft-require": {
"phpbb/phpbb": ">=3.3.2,<4.0.0@dev"
"phpbb/phpbb": ">=3.3.2"
},
"version-check": {
"host": "www.phpbb.com",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{% if S_BBCODE_MEDIA %}
<button type="button" class="button button-icon-only bbcode-media" accesskey="m" name="addmedia" value="Media" onclick="bbfontstyle('[media]', '[/media]');" title="{{ lang('BBCODE_MEDIA_HELP') }}">
<i class="icon fa-television fa-fw" aria-hidden="true"></i>
{% if constant('PHPBB_VERSION') starts with '4' %}
{{ include('@phpbb_mediaembed/media_embed_bbcode_icon.html') }}
{% else %}
<i class="icon fa-television fa-fw" aria-hidden="true"></i>
{% endif %}
</button>
{% endif %}
2 changes: 2 additions & 0 deletions styles/all/template/media_embed_bbcode_icon.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{# This template will be used in phpBB 4 #}
{{ Icon('font', 'tv', '', true, 'fas c-button-icon') }}
7 changes: 6 additions & 1 deletion tests/functional/media_embed_test.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ public function test_posting_media_bbcode()
{
$this->login();

$post = $this->create_topic(2, 'Media Embed Test Topic 1', "[media]https://youtu.be/$this->youtubeId[/media]");
$forum_id = 2;

$crawler = self::request('GET', "posting.php?mode=post&f={$forum_id}&sid={$this->sid}");
self::assertCount(1, $crawler->filter('button[name="addmedia"]'));

$post = $this->create_topic($forum_id, 'Media Embed Test Topic 1', "[media]https://youtu.be/$this->youtubeId[/media]");
$crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid=$this->sid");
self::assertStringContainsString("//www.youtube-nocookie.com/embed/$this->youtubeId", $crawler->filter("#post_content{$post['topic_id']} iframe")->attr('src'));
}
Expand Down