clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/friendika/friendika

This commit is contained in:
Tobias Diekershoff 2011-06-08 12:01:36 +02:00
parent 9ef5cb1c38 a10abd4860
commit 6f9fd92c2e
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mod/item.php
View File

@ -772,6 +772,17 @@ function item_content(&$a) {
// ignore the result // ignore the result
} }
// If item is a link to an event, nuke the event record.
if(intval($item['event-id'])) {
q("DELETE FROM `event` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($item['event-id']),
intval($item['uid'])
);
// ignore the result
}
// If it's the parent of a comment thread, kill all the kids // If it's the parent of a comment thread, kill all the kids
if($item['uri'] == $item['parent-uri']) { if($item['uri'] == $item['parent-uri']) {

8
mod/wall_upload.php
View File

@ -76,7 +76,9 @@ function wall_upload_post(&$a) {
$smallest = 0; $smallest = 0;
$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, '<0>'); $defperm = '<' . $page_owner_uid . '>';
$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm);
if(! $r) { if(! $r) {
echo ( t('Image upload failed.') . EOL); echo ( t('Image upload failed.') . EOL);
@ -85,14 +87,14 @@ function wall_upload_post(&$a) {
if($width > 640 || $height > 640) { if($width > 640 || $height > 640) {
$ph->scaleImage(640); $ph->scaleImage(640);
$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 1, 0, '<0>'); $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 1, 0, $defperm);
if($r) if($r)
$smallest = 1; $smallest = 1;
} }
if($width > 320 || $height > 320) { if($width > 320 || $height > 320) {
$ph->scaleImage(320); $ph->scaleImage(320);
$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 2, 0, '<0>' ); $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 2, 0, $defperm);
if($r) if($r)
$smallest = 2; $smallest = 2;
} }