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

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2014-01-10 12:38:23 -08:00
commit 069ea5fee9
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mod/channel.php
View File

@ -177,11 +177,14 @@ function channel_content(&$a, $update = 0, $load = false) {
if($load || ($_COOKIE['jsAvailable'] != 1)) { if($load || ($_COOKIE['jsAvailable'] != 1)) {
if ($mid) { if ($mid) {
$r = q("SELECT parent AS item_id from item where mid = '%s' limit 1", $r = q("SELECT parent AS item_id from item where mid = '%s' and uid = %d AND item_restrict = 0
dbesc($mid) AND (item_flags & %d) $sql_extra limit 1",
dbesc($mid),
intval($a->profile['profile_uid']),
intval(ITEM_WALL)
); );
if (! $r) { if (! $r) {
notice( t('Item not found.') . EOL); notice( t('Permission denied.') . EOL);
} }
} else { } else {

4
mod/filestorage.php
View File

@ -84,12 +84,12 @@ function filestorage_content(&$a) {
); );
if(! $r) { if(! $r) {
notice( t('File not found.') . EOL); notice( t('File not found.') . EOL);
goaway(z_root() . '/filestorage' . $which); goaway(z_root() . '/filestorage/' . $which);
} }
attach_delete($owner,$r[0]['hash']); attach_delete($owner,$r[0]['hash']);
goaway(z_root() . '/filestorage' . $which); goaway(z_root() . '/filestorage/' . $which);
} }