diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-15 19:15:47 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-15 19:15:47 -0400 |
| commit | f2dda646ecf1d11bf88c085d1174d3c147f799b1 (patch) | |
| tree | c86f59fcca3a84413d77c325be433c4c5ea862e2 /include/widgets.php | |
| parent | 98484f0def82493ff9d45405dadefd141a1b32ba (diff) | |
| parent | 47fc0c79588d55a207dc39ae8062ec55382e2564 (diff) | |
| download | volse-hubzilla-f2dda646ecf1d11bf88c085d1174d3c147f799b1.tar.gz volse-hubzilla-f2dda646ecf1d11bf88c085d1174d3c147f799b1.tar.bz2 volse-hubzilla-f2dda646ecf1d11bf88c085d1174d3c147f799b1.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'include/widgets.php')
| -rw-r--r-- | include/widgets.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/widgets.php b/include/widgets.php index 3ca189af0..cdd5d72ab 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -994,8 +994,9 @@ function widget_item($arr) { $sql_extra = item_permissions_sql($channel_id); if($arr['title']) { - $r = q("select item.* from item left join item_id on item.id = item_id.iid - where item.uid = %d and sid = '%s' and service = 'WEBPAGE' and item_type = %d $sql_options $revision limit 1", + $r = q("select item.* from item left join iconfig on item.id = iconfig.iid + where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' + and iconfig.k = 'WEBPAGE' and item_type = %d $sql_options $revision limit 1", intval($channel_id), dbesc($arr['title']), intval(ITEM_TYPE_WEBPAGE) @@ -1253,8 +1254,8 @@ function widget_random_block($arr) { $randfunc = db_getfunc('RAND'); - $r = q("select item.* from item left join item_id on item.id = item_id.iid - where item.uid = %d and sid like '%s' and service = 'BUILDBLOCK' and + $r = q("select item.* from item left join iconfig on item.id = iconfig.iid + where item.uid = %d and iconfig.cat = 'system' and iconfig.v like '%s' and iconfig.k = 'BUILDBLOCK' and item_type = %d $sql_options order by $randfunc limit 1", intval($channel_id), dbesc('%' . $contains . '%'), |