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/Module/Blocks.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/Module/Blocks.php')
| -rw-r--r-- | Zotlabs/Module/Blocks.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Zotlabs/Module/Blocks.php b/Zotlabs/Module/Blocks.php index 32650a090..475cfa6b3 100644 --- a/Zotlabs/Module/Blocks.php +++ b/Zotlabs/Module/Blocks.php @@ -27,7 +27,7 @@ class Blocks extends \Zotlabs\Web\Controller { } - function get() { + function get() { if(! \App::$profile) { notice( t('Requested profile is not available.') . EOL ); @@ -111,8 +111,11 @@ class Blocks extends \Zotlabs\Web\Controller { $editor = status_editor($a,$x); - $r = q("select iid, sid, mid, title, body, mimetype, created, edited from item_id left join item on item_id.iid = item.id - where item_id.uid = %d and service = 'BUILDBLOCK' and item_type = %d order by item.created desc", + + $r = q("select iconfig.iid, iconfig.k, iconfig.v, mid, title, body, mimetype, created, edited from iconfig + left join item on iconfig.iid = item.id + where uid = %d and iconfig.cat = 'system' and iconfig.k = 'BUILDBLOCK' + and item_type = %d order by item.created desc", intval($owner), intval(ITEM_TYPE_BLOCK) ); @@ -129,12 +132,12 @@ class Blocks extends \Zotlabs\Web\Controller { 'created' => $rr['created'], 'edited' => $rr['edited'], 'mimetype' => $rr['mimetype'], - 'pagetitle' => $rr['sid'], + 'pagetitle' => $rr['v'], 'mid' => $rr['mid'] ); $pages[$rr['iid']][] = array( 'url' => $rr['iid'], - 'name' => $rr['sid'], + 'name' => $rr['v'], 'title' => $rr['title'], 'created' => $rr['created'], 'edited' => $rr['edited'], |