X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=5b32e05736321831575ede3201a8c9d9e58e4429;hb=e9638b69801cee3e74a97825f9af3749c9322c53;hp=10195c2bac60dd544aa21251da43662de8b53e6b;hpb=08e54234e30c10e3130b7d71caba9fd43e3593e3;p=friendica.git

diff --git a/boot.php b/boot.php
index 10195c2bac..5b32e05736 100644
--- a/boot.php
+++ b/boot.php
@@ -8,9 +8,9 @@ require_once("include/pgettext.php");
 require_once('include/nav.php');
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1093' );
+define ( 'FRIENDIKA_VERSION',      '2.3.1116' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
-define ( 'DB_UPDATE_VERSION',      1087      );
+define ( 'DB_UPDATE_VERSION',      1092      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -165,6 +165,7 @@ define ( 'ACTIVITY_OBJ_PHOTO',   NAMESPACE_ACTIVITY_SCHEMA . 'photo' );
 define ( 'ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo' );
 define ( 'ACTIVITY_OBJ_ALBUM',   NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' );
 define ( 'ACTIVITY_OBJ_EVENT',   NAMESPACE_ACTIVITY_SCHEMA . 'event' );
+define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_DFRN            . '/tagterm' );
 
 /**
  * item weight for query ordering
@@ -185,7 +186,9 @@ define ( 'GRAVITY_COMMENT',      6);
 function startup() {
 	error_reporting(E_ERROR | E_WARNING | E_PARSE);
 	set_time_limit(0);
-	ini_set('pcre.backtrack_limit', 250000);
+
+	// This has to be quite large to deal with embedded private photos
+	ini_set('pcre.backtrack_limit', 350000);
 
 
 	if (get_magic_quotes_gpc()) {
@@ -881,8 +884,10 @@ function profile_sidebar($profile, $block = 0) {
 					'id' => $rr['id'],
 					'alt' => t('Profile Image'),
 					'profile_name' => $rr['profile-name'],
-					'visible' => (($rr['is-default']) ? '<strong>' . t('visible to everybody') . '</strong>' 
-						: '<a href="' . $a->get_baseurl() . '/profperm/' . $rr['id'] . '" />' . t('Edit visibility') . '</a>')
+					'isdefault' => $rr['is-default'],
+					'visibile_to_everybody' =>  t('visible to everybody'),
+					'edit_visibility' => t('Edit visibility'),
+					
 				);
 			}
 
@@ -933,7 +938,7 @@ function profile_sidebar($profile, $block = 0) {
 	$o .= replace_macros($tpl, array(
 		'$profile' => $profile,
 		'$connect'  => $connect,		
-		'$location' => $location,
+		'$location' => template_escape($location),
 		'$gender'   => $gender,
 		'$pdesc'	=> $pdesc,
 		'$marital'  => $marital,
@@ -989,7 +994,7 @@ function get_birthdays() {
 				$now = strtotime('now');
 				$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); 
 	
-				$o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="sparkle" href="' 
+				$o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="sparkle" target="redir" href="' 
 				. $a->get_baseurl() . '/redir/'  . $rr['cid'] . '">' . $rr['name'] . '</a> ' 
 				. day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '')
 				. '</div>' ;