X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FEvent.php;h=ec39cc7133d6efcdf1a555d87f71e7ba27f4a682;hb=6b8db5ad1333e2b430da3a771d9a962d44d4b6fc;hp=fe81a5e958a7606755b6d19ee78ebbeaeba2c290;hpb=b632114b12ec9a160d5442419c21a068c2eb472b;p=friendica.git

diff --git a/src/Model/Event.php b/src/Model/Event.php
index fe81a5e958..ec39cc7133 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -5,7 +5,6 @@
 
 namespace Friendica\Model;
 
-use Friendica\BaseObject;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
@@ -14,6 +13,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
@@ -23,7 +23,7 @@ use Friendica\Util\XML;
 /**
  * @brief functions for interacting with the event database table
  */
-class Event extends BaseObject
+class Event
 {
 
 	public static function getHTML(array $event, $simple = false)
@@ -257,7 +257,7 @@ class Event extends BaseObject
 		$event['deny_cid']  =        $arr['deny_cid']  ?? '';
 		$event['deny_gid']  =        $arr['deny_gid']  ?? '';
 		$event['adjust']    = intval($arr['adjust']    ?? 0);
-		$event['nofinish']  = intval(!empty($arr['nofinish'] || !empty($event['start']) && empty($event['finish'])));
+		$event['nofinish']  = intval($arr['nofinish'] ?? (!empty($event['start']) && empty($event['finish'])));
 
 		$event['created']   = DateTimeFormat::utc(($arr['created'] ?? '') ?: 'now');
 		$event['edited']    = DateTimeFormat::utc(($arr['edited']  ?? '') ?: 'now');
@@ -590,9 +590,9 @@ class Event extends BaseObject
 			$copy = null;
 			$drop = null;
 			if (local_user() && local_user() == $event['uid'] && $event['type'] == 'event') {
-				$edit = !$event['cid'] ? [System::baseUrl() . '/events/event/' . $event['id'], L10n::t('Edit event')     , '', ''] : null;
-				$copy = !$event['cid'] ? [System::baseUrl() . '/events/copy/' . $event['id'] , L10n::t('Duplicate event'), '', ''] : null;
-				$drop =                  [System::baseUrl() . '/events/drop/' . $event['id'] , L10n::t('Delete event')   , '', ''];
+				$edit = !$event['cid'] ? [DI::baseUrl() . '/events/event/' . $event['id'], L10n::t('Edit event')     , '', ''] : null;
+				$copy = !$event['cid'] ? [DI::baseUrl() . '/events/copy/' . $event['id'] , L10n::t('Duplicate event'), '', ''] : null;
+				$drop =                  [DI::baseUrl() . '/events/drop/' . $event['id'] , L10n::t('Delete event')   , '', ''];
 			}
 
 			$title = BBCode::convert(Strings::escapeHtml($event['summary']));