Merge pull request #1316 from annando/issue-1197

Issue 1197: New hook for "oembed_fetch_url"

diff --git a/.gitignore b/.gitignore
index 06dc807bd5444f7e5140655f743bb28f446a69f2..3c0570c67d2e40d25558c941d25f8ff061486bae 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -34,7 +34,11 @@ report/
 #ignore cache folders\r
 /privacy_image_cache/\r
 /photo/\r
+/proxy/\r
 nbproject\r
 \r
 #ignore vagrant dir\r
 .vagrant/\r
+\r
+#ignore local folder\r
+/local/\r

diff --git a/include/oembed.php b/include/oembed.php
index 0d7e5ee84f165f8ae74cfc62eb14f94978a1d4eb..00489193f388bd02ebef83a1883f4152b396e50f 100755 (executable)
--- 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 62bbbcbf0eafbd70edadc0d986f5cb98a4ee7020..14210d2424649117e35bffa0043c1a2c9c73926a 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -22,14 +22,14 @@ if ($style == "")
 
 if ($style == "flat")
        $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")
        $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/netcolour.css" type="text/css" media="screen"/>'."\n";
 else if ($style == "breathe")
        $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/breathe.css" type="text/css" media="screen"/>'."\n";
 else if ($style == "plus")
        $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
 <script type="text/javascript">