diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-08-03 21:17:00 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-08-03 21:17:00 -0700 |
| commit | f594a7776c37bfe6f1f07e259188d9de7057e189 (patch) | |
| tree | 74da2a4cd3314a7a3a870031a4056f05872bb082 /include | |
| parent | b737e224b149c1c27775bfc213125eea0ce540b8 (diff) | |
| parent | 56045093cc6674dfd89e0a2c3848c3e2992b3790 (diff) | |
| download | volse-hubzilla-f594a7776c37bfe6f1f07e259188d9de7057e189.tar.gz volse-hubzilla-f594a7776c37bfe6f1f07e259188d9de7057e189.tar.bz2 volse-hubzilla-f594a7776c37bfe6f1f07e259188d9de7057e189.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/it/messages.po
view/it/strings.php
Diffstat (limited to 'include')
| -rwxr-xr-x | include/items.php | 2 | ||||
| -rwxr-xr-x | include/oembed.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php index 30cde0745..e6ab52239 100755 --- a/include/items.php +++ b/include/items.php @@ -159,7 +159,7 @@ function filter_insecure($channel_id, $arr) { $ret = array(); - if((! intval(get_config($channel_id, 'system', 'filter_insecure_collections'))) || (! $arr)) + if((! intval(get_pconfig($channel_id, 'system', 'filter_insecure_collections'))) || (! $arr)) return $arr; $str = ''; diff --git a/include/oembed.php b/include/oembed.php index 0628afaa9..a11a64eec 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -95,7 +95,8 @@ function oembed_fetch_url($embedurl){ Cache::set($a->videowidth . $embedurl,$txt); } - + + $j = json_decode($txt); $j->embedurl = $embedurl; return $j; |