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

patch to allow theme based widgets

Browse Source
This commit is contained in:
redmatrix 2015-07-23 18:49:37 -07:00
parent 3ec6a431b6
commit 27fa908233
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boot.php
View File

@ -2051,7 +2051,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))

1
include/diaspora.php
View File

@ -1009,7 +1009,6 @@ function diaspora_post($importer,$xml,$msg) {
return 202; return 202;
} }
$result = item_store($datarray); $result = item_store($datarray);
return; return;

1
include/zot.php
View File

@ -1277,6 +1277,7 @@ function public_recips($msg) {
$include_sys = false; $include_sys = false;
if($msg['message']['type'] === 'activity') { if($msg['message']['type'] === 'activity') {
if(! get_config('system','disable_discover_tab'))
$include_sys = true; $include_sys = true;
$col = 'channel_w_stream'; $col = 'channel_w_stream';
$field = PERMS_W_STREAM; $field = PERMS_W_STREAM;

2
version.inc
View File

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