aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-10-01 00:56:13 -0700
committerfriendica <info@friendica.com>2013-10-01 00:56:13 -0700
commit82b835a18b34d98c77062cbf668548e18d23b624 (patch)
treeeffbe0a5c2507760ae065d9c786c91e1c070cac0 /include
parenta6c542289acd349baea37dff0fe7f37427964b15 (diff)
parentd7b81b1afd150ebc0abfcd12f6ab23d65b61a0af (diff)
downloadvolse-hubzilla-82b835a18b34d98c77062cbf668548e18d23b624.tar.gz
volse-hubzilla-82b835a18b34d98c77062cbf668548e18d23b624.tar.bz2
volse-hubzilla-82b835a18b34d98c77062cbf668548e18d23b624.zip
Merge pull request #161 from zzottel/master
Add possibility to use a block in a channel menu (set channel_menublock to ...
Diffstat (limited to 'include')
-rw-r--r--include/comanche.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/comanche.php b/include/comanche.php
index 526819572..f1dd0e521 100644
--- a/include/comanche.php
+++ b/include/comanche.php
@@ -87,7 +87,7 @@ function comanche_replace_region($match) {
function comanche_block($name) {
$o = '';
- $r = q("select * from item left join item_id on iid = item_id and item_id.uid = item.uid and item.uid = %d and service = 'BUILDBLOCK' and sid = '%s' limit 1",
+ $r = q("select * from item inner join item_id on iid = item.id and item_id.uid = item.uid and item.uid = %d and service = 'BUILDBLOCK' and sid = '%s' limit 1",
intval(get_app()->profile['profile_uid']),
dbesc($name)
);