diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-04-03 21:36:29 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-04-03 21:36:29 -0400 |
| commit | 0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f (patch) | |
| tree | a92197de4503ec52889dc05483493f4df1a305b8 /include/oembed.php | |
| parent | 99d9456b3addc651a68874ddd391d25684252c4d (diff) | |
| parent | b4c1baada1fba46d4d75f40a7e78111d70d54e7a (diff) | |
| download | volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.gz volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.bz2 volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
Diffstat (limited to 'include/oembed.php')
| -rwxr-xr-x | include/oembed.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/oembed.php b/include/oembed.php index fb7a30e65..3994af0fb 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -85,7 +85,7 @@ function oembed_fetch_url($embedurl){ // logger('fetch: ' . $embedurl); - $txt = Cache::get($a->videowidth . $embedurl); + $txt = Cache::get(App::$videowidth . $embedurl); if(strstr($txt,'youtu') && strstr(z_root(),'https:')) { $txt = str_replace('http:','https:',$txt); @@ -124,7 +124,7 @@ function oembed_fetch_url($embedurl){ $entries = $xpath->query("//link[@type='application/json+oembed']"); foreach($entries as $e){ $href = $e->getAttributeNode("href")->nodeValue; - $x = z_fetch_url($href . '&maxwidth=' . $a->videowidth); + $x = z_fetch_url($href . '&maxwidth=' . App::$videowidth); $txt = $x['body']; break; } @@ -133,7 +133,7 @@ function oembed_fetch_url($embedurl){ $entries = $xpath->query("//link[@type='text/json+oembed']"); foreach($entries as $e){ $href = $e->getAttributeNode("href")->nodeValue; - $x = z_fetch_url($href . '&maxwidth=' . $a->videowidth); + $x = z_fetch_url($href . '&maxwidth=' . App::$videowidth); $txt = $x['body']; break; } @@ -142,7 +142,7 @@ function oembed_fetch_url($embedurl){ } if ($txt==false || $txt=="") { - $x = array('url' => $embedurl,'videowidth' => $a->videowidth); + $x = array('url' => $embedurl,'videowidth' => App::$videowidth); call_hooks('oembed_probe',$x); if(array_key_exists('embed',$x)) $txt = $x['embed']; @@ -154,7 +154,7 @@ function oembed_fetch_url($embedurl){ //save in cache if(! get_config('system','oembed_cache_disable')) - Cache::set($a->videowidth . $embedurl,$txt); + Cache::set(App::$videowidth . $embedurl,$txt); } @@ -195,7 +195,7 @@ function oembed_format_object($j){ } $ret.=replace_macros($tpl, array( - '$baseurl' => $a->get_baseurl(), + '$baseurl' => z_root(), '$embedurl'=>$embedurl, '$escapedhtml'=>base64_encode($jhtml), '$tw'=>$tw, |