diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-14 19:56:04 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-14 19:56:04 -0400 |
| commit | eeaafe9f3918661022b465fe0522a3f0e44065b0 (patch) | |
| tree | b0e2e941b670419950630a4cfc2b0078da69b502 /Zotlabs/Render/Comanche.php | |
| parent | 6430a232f88ed214997d7704c18aead873094a0f (diff) | |
| parent | 0ef2622621867fa197988974b47eff85f20a80e7 (diff) | |
| download | volse-hubzilla-eeaafe9f3918661022b465fe0522a3f0e44065b0.tar.gz volse-hubzilla-eeaafe9f3918661022b465fe0522a3f0e44065b0.tar.bz2 volse-hubzilla-eeaafe9f3918661022b465fe0522a3f0e44065b0.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'Zotlabs/Render/Comanche.php')
| -rw-r--r-- | Zotlabs/Render/Comanche.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php index 1017ec6aa..820897ee9 100644 --- a/Zotlabs/Render/Comanche.php +++ b/Zotlabs/Render/Comanche.php @@ -179,7 +179,8 @@ class Comanche { $channel_id = $this->get_channel_id(); if($channel_id) { - $r = q("select * from item inner join item_id on iid = item.id and item_id.uid = item.uid and item.uid = %d and service = 'BUILDBLOCK' and sid = '%s' limit 1", + $r = q("select * from item inner join iconfig on iconfig.iid = item.id and item.uid = %d + and iconfig.cat = 'system' and iconfig.k = 'BUILDBLOCK' and iconfig.v = '%s' limit 1", intval($channel_id), dbesc($name) ); @@ -282,12 +283,12 @@ class Comanche { /** - * Widgets will have to get any operational arguments from the session, the - * global app environment, or config storage until we implement argument passing + * Render a widget * * @param string $name * @param string $text */ + function widget($name, $text) { $vars = array(); $matches = array(); @@ -314,7 +315,7 @@ class Comanche { require_once(theme_include($theme_widget)); } - if (function_exists($func)) + if(function_exists($func)) return $func($vars); } |