Page MenuHomestyx hydra
Files F234587

No OneTemporary
Actions

View Options

diff --git a/src/infrastructure/markup/rule/PhabricatorYoutubeRemarkupRule.php b/src/infrastructure/markup/rule/PhabricatorYoutubeRemarkupRule.php
index bad8e0eacf..25422b970d 100644
--- a/src/infrastructure/markup/rule/PhabricatorYoutubeRemarkupRule.php
+++ b/src/infrastructure/markup/rule/PhabricatorYoutubeRemarkupRule.php
@@ -1,51 +1,55 @@
<?php
final class PhabricatorYoutubeRemarkupRule extends PhutilRemarkupRule {
- private $uri;
-
public function getPriority() {
return 350.0;
}
public function apply($text) {
- $this->uri = new PhutilURI($text);
+ try {
+ $uri = new PhutilURI($text);
+ } catch (Exception $ex) {
+ return $text;
+ }
- if ($this->uri->getDomain() &&
- preg_match('/(^|\.)youtube\.com$/', $this->uri->getDomain()) &&
- idx($this->uri->getQueryParams(), 'v')) {
- return $this->markupYoutubeLink();
+ $domain = $uri->getDomain();
+ if (!preg_match('/(^|\.)youtube\.com\z/', $domain)) {
+ return $text;
}
- return $text;
- }
+ $params = $uri->getQueryParams();
+ $v_param = idx($params, 'v');
+ if (!strlen($v_param)) {
+ return $text;
+ }
- public function markupYoutubeLink() {
- $v = idx($this->uri->getQueryParams(), 'v');
$text_mode = $this->getEngine()->isTextMode();
$mail_mode = $this->getEngine()->isHTMLMailMode();
if ($text_mode || $mail_mode) {
- return $this->getEngine()->storeText('http://youtu.be/'.$v);
+ return $text;
}
- $youtube_src = 'https://www.youtube.com/embed/'.$v;
+ $youtube_src = 'https://www.youtube.com/embed/'.$v_param;
+
$iframe = $this->newTag(
'div',
array(
'class' => 'embedded-youtube-video',
),
$this->newTag(
'iframe',
array(
'width' => '650',
'height' => '400',
'style' => 'margin: 1em auto; border: 0px;',
'src' => $youtube_src,
'frameborder' => 0,
),
''));
+
return $this->getEngine()->storeText($iframe);
}
}

File Metadata

Mime Type
text/x-diff
Expires
Mon, Jul 28, 6:34 PM (1 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
187352
Default Alt Text
(2 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)