X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=139564ec551b81f3df4279379c1657a30344777e;hb=b1338548b05243c8c73902999d135b8ba980d4ce;hp=a784b37b05b897001f9e2f2c73f2342922d94d23;hpb=17236b18011f6c2fa7df7d1433dd815d4438baf8;p=friendica.git

diff --git a/boot.php b/boot.php
index a784b37b05..139564ec55 100644
--- a/boot.php
+++ b/boot.php
@@ -14,7 +14,7 @@ require_once('include/features.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '3.2.1748' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1169      );
+define ( 'DB_UPDATE_VERSION',      1170      );
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
 
@@ -142,6 +142,7 @@ define ( 'NETWORK_GPLUS',            'goog');    // Google+
 define ( 'NETWORK_PUMPIO',           'pump');    // pump.io
 define ( 'NETWORK_TWITTER',          'twit');    // Twitter
 define ( 'NETWORK_DIASPORA2',        'dspc');    // Diaspora connector
+define ( 'NETWORK_STATUSNET',        'stac');    // Statusnet connector
 
 define ( 'NETWORK_PHANTOM',          'unkn');    // Place holder
 
@@ -167,6 +168,7 @@ $netgroup_ids = array(
 	NETWORK_PUMPIO   => (-13),
 	NETWORK_TWITTER  => (-14),
 	NETWORK_DIASPORA2 => (-15),
+	NETWORK_STATUSNET => (-16),
 
 	NETWORK_PHANTOM  => (-127),
 );
@@ -739,7 +741,7 @@ if(! class_exists('App')) {
 			if($this->cached_profile_picdate[$common_filename]){
 				$this->cached_profile_image[$avatar_image] = $avatar_image . $this->cached_profile_picdate[$common_filename];
 			} else {
-				$r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like \"%%/%s\"",
+				$r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like '%%/%s'",
 					$common_filename);
 				if(! count($r)){
 					$this->cached_profile_image[$avatar_image] = $avatar_image;
@@ -1328,7 +1330,7 @@ if(! function_exists('profile_load')) {
 		if($profile) {
 			$profile_int = intval($profile);
 			$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
-					left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
+					INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
 					WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d and `contact`.`self` = 1 LIMIT 1",
 					dbesc($nickname),
 					intval($profile_int)
@@ -1336,7 +1338,7 @@ if(! function_exists('profile_load')) {
 		}
 		if((! $r) && (!  count($r))) {
 			$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
-					left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
+					INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
 					WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 and `contact`.`self` = 1 LIMIT 1",
 					dbesc($nickname)
 			);
@@ -1591,7 +1593,7 @@ if(! function_exists('get_birthdays')) {
 		$bd_short = t('F d');
 
 		$r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
-				LEFT JOIN `contact` ON `contact`.`id` = `event`.`cid`
+				INNER JOIN `contact` ON `contact`.`id` = `event`.`cid`
 				WHERE `event`.`uid` = %d AND `type` = 'birthday' AND `start` < '%s' AND `finish` > '%s'
 				ORDER BY `start` ASC ",
 				intval(local_user()),