harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	view/it/messages.po
	view/it/strings.php
This commit is contained in:
redmatrix 2015-08-03 21:17:00 -07:00
commit f594a7776c
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/items.php
View File

@ -159,7 +159,7 @@ function filter_insecure($channel_id, $arr) {
$ret = array(); $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; return $arr;
$str = ''; $str = '';

1
include/oembed.php
View File

@ -96,6 +96,7 @@ function oembed_fetch_url($embedurl){
} }
$j = json_decode($txt); $j = json_decode($txt);
$j->embedurl = $embedurl; $j->embedurl = $embedurl;
return $j; return $j;

2
version.inc
View File

@ -1 +1 @@
2015-08-02.1112 2015-08-03.1113