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:
	include/diaspora.php
This commit is contained in:
redmatrix
2015-07-23 21:07:35 -07:00
parent c0e67db070 908da4589d
commit cc5b0cde1d
6 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/items.php
View File

@@ -3386,7 +3386,7 @@ function post_is_importable($item,$abook) {
$lang = null;
if((strpos($abook['abook_incl'],'lang=') !== false) || (strpos($abook['abook_incl'],'lang=') !== false))
if((strpos($abook['abook_incl'],'lang=') !== false) || (strpos($abook['abook_excl'],'lang=') !== false))
$lang = detect_language($text);
$tags = ((count($item['term'])) ? $item['term'] : false);