jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Editing an item with an event is now opeing the event edit form.

Browse source
This commit is contained in:
Michael Vogel 2015-10-17 08:27:33 +02:00
parent 7f9711ffe6
commit 316276cb6d
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/events.php
View file

@ -154,6 +154,7 @@ function events_post(&$a) {
if(! $cid) if(! $cid)
proc_run('php',"include/notifier.php","event","$item_id"); proc_run('php',"include/notifier.php","event","$item_id");
goaway($_SESSION['return_url']);
} }
@ -165,6 +166,9 @@ function events_content(&$a) {
return; return;
} }
if($a->argc == 1)
$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
if(($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) { if(($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
$r = q("update event set ignore = 1 where id = %d and uid = %d", $r = q("update event set ignore = 1 where id = %d and uid = %d",
intval($a->argv[2]), intval($a->argv[2]),

9
object/Item.php
View file

@ -117,9 +117,12 @@ class Item extends BaseObject {
? t('Private Message') ? t('Private Message')
: false); : false);
$shareable = ((($conv->get_profile_owner() == local_user()) && ($item['private'] != 1)) ? true : false); $shareable = ((($conv->get_profile_owner() == local_user()) && ($item['private'] != 1)) ? true : false);
if(local_user() && link_compare($a->contact['url'],$item['author-link'])) if(local_user() && link_compare($a->contact['url'],$item['author-link'])) {
$edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit")); if ($item["event-id"] != 0)
else $edpost = array($a->get_baseurl($ssl_state)."/events/event/".$item['event-id'], t("Edit"));
else
$edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
} else
$edpost = false; $edpost = false;
if(($this->get_data_value('uid') == local_user()) || $this->is_visiting()) if(($this->get_data_value('uid') == local_user()) || $this->is_visiting())
$dropping = true; $dropping = true;