aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-08 18:05:38 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-08 18:05:38 -0700
commit43354ab385cd5c7adcc86f591159f10201420aae (patch)
treeb22490a0bbef67f65740e2daf070120163f5c301
parent6b41074396f72f8c47e3d6479b1035cde4a5c7f8 (diff)
downloadvolse-hubzilla-43354ab385cd5c7adcc86f591159f10201420aae.tar.gz
volse-hubzilla-43354ab385cd5c7adcc86f591159f10201420aae.tar.bz2
volse-hubzilla-43354ab385cd5c7adcc86f591159f10201420aae.zip
inconsistent naming of block item types
-rw-r--r--include/widgets.php2
-rw-r--r--mod/block.php4
-rw-r--r--mod/blocks.php4
-rw-r--r--mod/editblock.php2
4 files changed, 6 insertions, 6 deletions
diff --git a/include/widgets.php b/include/widgets.php
index d87a8c440..bafd9c7a2 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -903,7 +903,7 @@ function widget_random_block($arr) {
item_type = %d $sql_options order by $randfunc limit 1",
intval($channel_id),
dbesc('%' . $contains . '%'),
- intval(ITEM_TYPE_BUILDBLOCK)
+ intval(ITEM_TYPE_BLOCK)
);
if($r) {
diff --git a/mod/block.php b/mod/block.php
index fb5645d8a..df3909629 100644
--- a/mod/block.php
+++ b/mod/block.php
@@ -53,7 +53,7 @@ function block_content(&$a) {
item_type = %d $sql_options $revision limit 1",
intval($u[0]['channel_id']),
dbesc($page_id),
- intval(ITEM_TYPE_BUILDBLOCK)
+ intval(ITEM_TYPE_BLOCK)
);
if(! $r) {
@@ -65,7 +65,7 @@ function block_content(&$a) {
item_type = %d $revision limit 1",
intval($u[0]['channel_id']),
dbesc($page_id),
- intval(ITEM_TYPE_BUILDBLOCK)
+ intval(ITEM_TYPE_BLOCK)
);
if($x) {
// Yes, it's there. You just aren't allowed to see it.
diff --git a/mod/blocks.php b/mod/blocks.php
index 95979a304..97cc5cd53 100644
--- a/mod/blocks.php
+++ b/mod/blocks.php
@@ -84,7 +84,7 @@ function blocks_content(&$a) {
}
$x = array(
- 'webpage' => ITEM_TYPE_BUILDBLOCK,
+ 'webpage' => ITEM_TYPE_BLOCK,
'is_owner' => true,
'nickname' => $a->profile['channel_address'],
'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
where item_id.uid = %d and service = 'BUILDBLOCK' and item_type = %d order by item.created desc",
intval($owner),
- intval(ITEM_TYPE_BUILDBLOCK)
+ intval(ITEM_TYPE_BLOCK)
);
$pages = null;
diff --git a/mod/editblock.php b/mod/editblock.php
index 9f9770e77..21d7cc537 100644
--- a/mod/editblock.php
+++ b/mod/editblock.php
@@ -136,7 +136,7 @@ function editblock_content(&$a) {
$o .= replace_macros($tpl,array(
'$return_path' => $rp,
'$action' => 'item',
- '$webpage' => ITEM_TYPE_BUILDBLOCK,
+ '$webpage' => ITEM_TYPE_BLOCK,
'$share' => t('Edit'),
'$bold' => t('Bold'),
'$italic' => t('Italic'),