aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Render
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-06-14 09:42:43 +0200
committerMario Vavti <mario@mariovavti.com>2016-06-14 09:42:43 +0200
commit5c458e9111d8853891a0545d63fe7f55ee0f5a41 (patch)
tree01f80be918dd76a58cc1102166c53048631aed8a /Zotlabs/Render
parentb6d425838f9025d8faf6dbfe90fce091d94b3cd7 (diff)
parent0ef2622621867fa197988974b47eff85f20a80e7 (diff)
downloadvolse-hubzilla-5c458e9111d8853891a0545d63fe7f55ee0f5a41.tar.gz
volse-hubzilla-5c458e9111d8853891a0545d63fe7f55ee0f5a41.tar.bz2
volse-hubzilla-5c458e9111d8853891a0545d63fe7f55ee0f5a41.zip
Merge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs/Render')
-rw-r--r--Zotlabs/Render/Comanche.php9
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);
}