diff --git a/.gitignore b/.gitignore index 06dc807bd..3c0570c67 100644 --- a/.gitignore +++ b/.gitignore @@ -34,7 +34,11 @@ report/ #ignore cache folders /privacy_image_cache/ /photo/ +/proxy/ nbproject #ignore vagrant dir .vagrant/ + +#ignore local folder +/local/ diff --git a/include/oembed.php b/include/oembed.php index 0d7e5ee84..00489193f 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -110,6 +110,8 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){ } } + call_hooks('oembed_fetch_url', $embedurl, $j); + return $j; } diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index 62bbbcbf0..14210d242 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -22,14 +22,14 @@ if ($style == "") if ($style == "flat") $a->page['htmlhead'] .= ''."\n"; -if ($style == "dark") - $a->page['htmlhead'] .= ''."\n"; else if ($style == "netcolour") $a->page['htmlhead'] .= ''."\n"; else if ($style == "breathe") $a->page['htmlhead'] .= ''."\n"; else if ($style == "plus") $a->page['htmlhead'] .= ''."\n"; +else if ($style == "dark") + $a->page['htmlhead'] .= ''."\n"; $a->page['htmlhead'] .= <<< EOT