aboutsummaryrefslogtreecommitdiffstats
path: root/mod/display.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-05-29 16:14:10 -0700
committerfriendica <info@friendica.com>2014-05-29 16:14:10 -0700
commit9b5eabf1083602382385c62c6ad7d8ae8e167f9e (patch)
treea73ed07970a517dbad90f14954fea790193813c3 /mod/display.php
parenta00103b7dfa0b128cbe6ab03e6a43ccedb24f8c2 (diff)
parent1a58777daa0ab9394f38737a806a7a185ebceeb0 (diff)
downloadvolse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.tar.gz
volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.tar.bz2
volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.zip
Merge branch 'master' into newevent
Conflicts: include/zot.php
Diffstat (limited to 'mod/display.php')
-rw-r--r--mod/display.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/display.php b/mod/display.php
index f4d4c38c3..efc3265c8 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -77,8 +77,8 @@ function display_content(&$a, $update = 0, $load = false) {
$target_item = null;
- $r = q("select id, uid, mid, parent_mid, item_restrict from item where mid = '%s' limit 1",
- dbesc($item_hash)
+ $r = q("select id, uid, mid, parent_mid, item_restrict from item where mid like '%s' limit 1",
+ dbesc($item_hash . '%')
);
if($r) {
@@ -149,6 +149,7 @@ function display_content(&$a, $update = 0, $load = false) {
if($load || ($_COOKIE['jsAvailable'] != 1)) {
$r = null;
+
if(local_user()) {
$r = q("SELECT * from item
WHERE item_restrict = 0
@@ -177,7 +178,6 @@ function display_content(&$a, $update = 0, $load = false) {
);
}
-
}
else {
$r = array();