harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inconsistent naming of block item types

Browse Source
This commit is contained in:
redmatrix 2015-07-08 18:05:38 -07:00
parent 6b41074396
commit 43354ab385
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/widgets.php
View File

@ -903,7 +903,7 @@ function widget_random_block($arr) {
item_type = %d $sql_options order by $randfunc limit 1", item_type = %d $sql_options order by $randfunc limit 1",
intval($channel_id), intval($channel_id),
dbesc('%' . $contains . '%'), dbesc('%' . $contains . '%'),
intval(ITEM_TYPE_BUILDBLOCK) intval(ITEM_TYPE_BLOCK)
); );
if($r) { if($r) {

4
mod/block.php
View File

@ -53,7 +53,7 @@ function block_content(&$a) {
item_type = %d $sql_options $revision limit 1", item_type = %d $sql_options $revision limit 1",
intval($u[0]['channel_id']), intval($u[0]['channel_id']),
dbesc($page_id), dbesc($page_id),
intval(ITEM_TYPE_BUILDBLOCK) intval(ITEM_TYPE_BLOCK)
); );
if(! $r) { if(! $r) {
@ -65,7 +65,7 @@ function block_content(&$a) {
item_type = %d $revision limit 1", item_type = %d $revision limit 1",
intval($u[0]['channel_id']), intval($u[0]['channel_id']),
dbesc($page_id), dbesc($page_id),
intval(ITEM_TYPE_BUILDBLOCK) intval(ITEM_TYPE_BLOCK)
); );
if($x) { if($x) {
// Yes, it's there. You just aren't allowed to see it. // Yes, it's there. You just aren't allowed to see it.

4
mod/blocks.php
View File

@ -84,7 +84,7 @@ function blocks_content(&$a) {
} }
$x = array( $x = array(
'webpage' => ITEM_TYPE_BUILDBLOCK, 'webpage' => ITEM_TYPE_BLOCK,
'is_owner' => true, 'is_owner' => true,
'nickname' => $a->profile['channel_address'], 'nickname' => $a->profile['channel_address'],
'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
@ -110,7 +110,7 @@ function blocks_content(&$a) {
$r = q("select iid, sid, mid, title, body, mimetype, created, edited 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' and item_type = %d order by item.created desc", where item_id.uid = %d and service = 'BUILDBLOCK' and item_type = %d order by item.created desc",
intval($owner), intval($owner),
intval(ITEM_TYPE_BUILDBLOCK) intval(ITEM_TYPE_BLOCK)
); );
$pages = null; $pages = null;

2
mod/editblock.php
View File

@ -136,7 +136,7 @@ function editblock_content(&$a) {
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$return_path' => $rp, '$return_path' => $rp,
'$action' => 'item', '$action' => 'item',
'$webpage' => ITEM_TYPE_BUILDBLOCK, '$webpage' => ITEM_TYPE_BLOCK,
'$share' => t('Edit'), '$share' => t('Edit'),
'$bold' => t('Bold'), '$bold' => t('Bold'),
'$italic' => t('Italic'), '$italic' => t('Italic'),