aboutsummaryrefslogtreecommitdiffstats
path: root/addon/oembed/oembed.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-03-30 16:05:43 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-03-30 16:05:43 +0200
commit9acccb2b90ff5276c0cc84b3b006c7a393c53786 (patch)
tree073576560eaa6e00266c3e85a5e76df6e1dca032 /addon/oembed/oembed.php
parent05d9035aaa55c3b38fcb15d799644e3c5eda5f11 (diff)
parent18da7efa27fcff8fb2b3b679938954e712427de9 (diff)
downloadvolse-hubzilla-9acccb2b90ff5276c0cc84b3b006c7a393c53786.tar.gz
volse-hubzilla-9acccb2b90ff5276c0cc84b3b006c7a393c53786.tar.bz2
volse-hubzilla-9acccb2b90ff5276c0cc84b3b006c7a393c53786.zip
Merge remote-tracking branch 'friendika-master/master'
Diffstat (limited to 'addon/oembed/oembed.php')
-rw-r--r--addon/oembed/oembed.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/addon/oembed/oembed.php b/addon/oembed/oembed.php
index 4bbd75387..d9b205a3a 100644
--- a/addon/oembed/oembed.php
+++ b/addon/oembed/oembed.php
@@ -18,6 +18,10 @@ function oembed_uninstall() {
}
function oembed_hook_page_header($a, &$b){
+
+ if(($a->module !== 'network') && ($a->module !== 'profile'))
+ return;
+
$b .= '<script src="addon/oembed/oembed.js"></script>
<style>#oembed.hide { display: none }
#oembed {
@@ -33,11 +37,11 @@ function oembed_hook_page_header($a, &$b){
<div id="oembed" class="hide"><input id="oembed_url">&nbsp;
<input type="button" value="Embed" onclick="oembed_do()" style="float:left;">
<a onclick="oembed(); return false;" style="float:right;"><img onmouseout="imgdull(this);" onmouseover="imgbright(this);" class="wall-item-delete-icon" src="images/b_drophide.gif" style="width: 16px; height: 16px;"></a>
- <p style="clear:both">Paste a link from 5min.com, Amazon Product Image, blip.tv, Clikthrough, CollegeHumor Video,
+ <div style="clear:both">Paste a link from 5min.com, Amazon Product Image, blip.tv, Clikthrough, CollegeHumor Video,
Daily Show with Jon Stewart, Dailymotion, dotSUB.com, Flickr Photos, Funny or Die Video,
Google Video, Hulu, Kinomap, LiveJournal UserPic, Metacafe, National Film Board of Canada,
Phodroid Photos, Photobucket, Qik Video, Revision3, Scribd, SlideShare, TwitPic, Twitter Status,
- Viddler Video, Vimeo, Wikipedia, Wordpress.com, XKCD Comic, YFrog, YouTube</p>
+ Viddler Video, Vimeo, Wikipedia, Wordpress.com, XKCD Comic, YFrog, YouTube</div>
</div>
';
}