Merge pull request #5520 from annando/notices

Some more notices removed

mod/cal.php

@@ -46,7 +46,7 @@ function cal_init(App $a)
 
 		// if it's a json request abort here becaus we don't
 		// need the widget data
-		if ($a->argv[2] === 'json') {
+		if (!empty($a->argv[2]) && ($a->argv[2] === 'json')) {
 			return;
 		}
 
@@ -194,7 +194,7 @@ function cal_content(App $a)
 		$finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
 
 
-		if ($a->argv[2] === 'json') {
+		if (!empty($a->argv[2]) && ($a->argv[2] === 'json')) {
 			if (x($_GET, 'start')) {
 				$start = $_GET['start'];
 			}
@@ -242,7 +242,7 @@ function cal_content(App $a)
 		// transform the event in a usable array
 		$events = Event::prepareListForTemplate($r);
 
-		if ($a->argv[2] === 'json') {
+		if (!empty($a->argv[2]) && ($a->argv[2] === 'json')) {
 			echo json_encode($events);
 			killme();
 		}

src/Content/OEmbed.php

@@ -152,7 +152,7 @@ class OEmbed
 				$oembed->description = $data['text'];
 			}
 
-			if (is_array($data['images'])) {
+			if (!empty($data['images'])) {
 				$oembed->thumbnail_url = $data['images'][0]['src'];
 				$oembed->thumbnail_width = $data['images'][0]['width'];
 				$oembed->thumbnail_height = $data['images'][0]['height'];

src/Model/PermissionSet.php

@@ -102,7 +102,6 @@ class PermissionSet extends BaseObject
 			$set[] = $permission['id'];
 		}
 		DBA::close($ret);
-		logger('Blubb: '.$uid.' - '.$contact_id.': '.implode(', ', $set));
 
 		return $set;
 	}

src/Model/Profile.php

@@ -116,6 +116,10 @@ class Profile
 			return;
 		}
 
+		if (empty($pdata)) {
+			$pdata = ['uid' => 0, 'profile_uid' => 0, 'is-default' => false,'name' => $nickname];
+		}
+
 		// fetch user tags if this isn't the default profile
 
 		if (!$pdata['is-default']) {