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
commit cc5b0cde1d
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boot.php
View File

@ -2009,7 +2009,6 @@ function load_pdl(&$a) {
if((! $s) && (($p = theme_include($n)) != '')) if((! $s) && (($p = theme_include($n)) != ''))
$s = @file_get_contents($p); $s = @file_get_contents($p);
if($s) { if($s) {
comanche_parser($a, $s); comanche_parser($a, $s);
$a->pdl = $s; $a->pdl = $s;

5
include/comanche.php
View File

@ -284,6 +284,11 @@ function comanche_widget($name, $text) {
if(file_exists('widget/' . trim($name) . '.php')) if(file_exists('widget/' . trim($name) . '.php'))
require_once('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); $func = 'widget_' . trim($name);
if (function_exists($func)) if (function_exists($func))

2
include/items.php
View File

@ -3386,7 +3386,7 @@ function post_is_importable($item,$abook) {
$lang = null; $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); $lang = detect_language($text);
$tags = ((count($item['term'])) ? $item['term'] : false); $tags = ((count($item['term'])) ? $item['term'] : false);

3
include/zot.php
View File

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

3
mod/events.php
View File

@ -148,10 +148,9 @@ function events_post(&$a) {
} }
} }
else { else {
// Note: do not set `private` field for self-only events. It will
// keep even you from seeing them!
$str_contact_allow = '<' . $channel['channel_hash'] . '>'; $str_contact_allow = '<' . $channel['channel_hash'] . '>';
$str_group_allow = $str_contact_deny = $str_group_deny = ''; $str_group_allow = $str_contact_deny = $str_group_deny = '';
$private_event = true;
} }
} }

2
version.inc
View File

@ -1 +1 @@
2015-07-21.1100 2015-07-23.1102