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

5
include/comanche.php
View File

@@ -284,6 +284,11 @@ function comanche_widget($name, $text) {
if(file_exists('widget/' . trim($name) . '.php'))
require_once('widget/' . trim($name) . '.php');
else {
$theme_widget = 'widget_' . trim($name) . '.php';
if(theme_include($theme_widget))
require_once(theme_include($theme_widget));
}
$func = 'widget_' . trim($name);
if (function_exists($func))

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);

3
include/zot.php
View File

@@ -1256,7 +1256,8 @@ function public_recips($msg) {
$include_sys = false;
if($msg['message']['type'] === 'activity') {
$include_sys = true;
if(! get_config('system','disable_discover_tab'))
$include_sys = true;
$col = 'channel_w_stream';
$field = PERMS_W_STREAM;
if(array_key_exists('flags',$msg['message']) && in_array('thread_parent', $msg['message']['flags'])) {