clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1316 from annando/issue-1197 

Issue 1197: New hook for "oembed_fetch_url"
This commit is contained in:
Tobias Diekershoff 2015-01-25 08:23:52 +01:00
parent 5639f0448b cd41746597
commit fc62c329c5
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -34,7 +34,11 @@ report/
#ignore cache folders #ignore cache folders
/privacy_image_cache/ /privacy_image_cache/
/photo/ /photo/
/proxy/
nbproject nbproject
#ignore vagrant dir #ignore vagrant dir
.vagrant/ .vagrant/
#ignore local folder
/local/

2
include/oembed.php
View File

@ -110,6 +110,8 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
} }
} }
call_hooks('oembed_fetch_url', $embedurl, $j);
return $j; return $j;
} }

4
view/theme/vier/theme.php
View File

@ -22,14 +22,14 @@ if ($style == "")
if ($style == "flat") if ($style == "flat")
$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/flat.css" type="text/css" media="screen"/>'."\n"; $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/flat.css" type="text/css" media="screen"/>'."\n";
if ($style == "dark")
$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/dark.css" type="text/css" media="screen"/>'."\n";
else if ($style == "netcolour") else if ($style == "netcolour")
$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/netcolour.css" type="text/css" media="screen"/>'."\n"; $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/netcolour.css" type="text/css" media="screen"/>'."\n";
else if ($style == "breathe") else if ($style == "breathe")
$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/breathe.css" type="text/css" media="screen"/>'."\n"; $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/breathe.css" type="text/css" media="screen"/>'."\n";
else if ($style == "plus") else if ($style == "plus")
$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/plus.css" type="text/css" media="screen"/>'."\n"; $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/plus.css" type="text/css" media="screen"/>'."\n";
else if ($style == "dark")
$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/dark.css" type="text/css" media="screen"/>'."\n";
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= <<< EOT
<script type="text/javascript"> <script type="text/javascript">