diff options
| author | friendica <info@friendica.com> | 2015-04-29 21:49:43 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-04-29 21:49:43 -0700 |
| commit | c4221f32738dac51f691d5be1bebd2b50318521e (patch) | |
| tree | e353242b42ca2942d7fe6d29888568c8bfe821ee /mod/blocks.php | |
| parent | 6679734135fb04f4a7beccb81663bf1e9574f062 (diff) | |
| parent | 2376d2140ab6eeb8a44d7582a52978520844e229 (diff) | |
| download | volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.tar.gz volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.tar.bz2 volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.zip | |
Merge branch 'master' into tres
Conflicts:
include/notifier.php
Diffstat (limited to 'mod/blocks.php')
| -rw-r--r-- | mod/blocks.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mod/blocks.php b/mod/blocks.php index f609164e0..56da9caf7 100644 --- a/mod/blocks.php +++ b/mod/blocks.php @@ -95,6 +95,7 @@ function blocks_content(&$a) { 'ptlabel' => t('Block Name'), 'profile_uid' => intval($owner), 'expanded' => true, + 'novoting' => true ); if($_REQUEST['title']) @@ -106,7 +107,7 @@ function blocks_content(&$a) { $editor = status_editor($a,$x); - $r = q("select * from item_id left join item on item_id.iid = item.id + $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' order by item.created desc", intval($owner) ); @@ -118,6 +119,7 @@ function blocks_content(&$a) { foreach($r as $rr) { $element_arr = array( 'type' => 'block', + 'title' => $rr['title'], 'body' => $rr['body'], 'created' => $rr['created'], 'edited' => $rr['edited'], @@ -127,7 +129,8 @@ function blocks_content(&$a) { ); $pages[$rr['iid']][] = array( 'url' => $rr['iid'], - 'title' => $rr['sid'], + 'name' => $rr['sid'], + 'title' => $rr['title'], 'created' => $rr['created'], 'edited' => $rr['edited'], 'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]' @@ -142,6 +145,7 @@ function blocks_content(&$a) { '$baseurl' => $url, '$title' => t('Blocks'), '$name' => t('Block Name'), + '$blocktitle' => t('Block Title'), '$created' => t('Created'), '$edited' => t('Edited'), '$create' => t('Create'), |