From 2b01d2b6e0dd52fc350fdabb895bf7959e2727e1 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 12 Apr 2012 16:12:51 -0700
Subject: rev update
---
boot.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'boot.php')
diff --git a/boot.php b/boot.php
index 09aabf5d8..1022c1eb4 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1309' );
+define ( 'FRIENDICA_VERSION', '2.3.1310' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1138 );
--
cgit v1.2.3
From 972c01edb3009e835d7a5a0861867cea8c06283f Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 12 Apr 2012 21:10:32 -0700
Subject: profile change activities
---
boot.php | 1 +
1 file changed, 1 insertion(+)
(limited to 'boot.php')
diff --git a/boot.php b/boot.php
index 1022c1eb4..e77a35d8b 100644
--- a/boot.php
+++ b/boot.php
@@ -206,6 +206,7 @@ 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' );
+define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_DFRN . '/profile' );
/**
* item weight for query ordering
--
cgit v1.2.3
From dfe774179ad9a08a27bfc404e563422adbf0917f Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 13 Apr 2012 14:44:37 -0700
Subject: rev update
---
boot.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'boot.php')
diff --git a/boot.php b/boot.php
index e77a35d8b..5ba3b1b4a 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1310' );
+define ( 'FRIENDICA_VERSION', '2.3.1311' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1138 );
--
cgit v1.2.3
From 0d869ceb65badbd4d80dd0d5cf2d631bca7f5b9e Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 14 Apr 2012 03:51:41 -0700
Subject: pass zrl's to/through global directory
---
boot.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'boot.php')
diff --git a/boot.php b/boot.php
index 5ba3b1b4a..0bd201a25 100644
--- a/boot.php
+++ b/boot.php
@@ -1494,11 +1494,13 @@ function get_my_url() {
return false;
}
-function zrl($s) {
+function zrl($s,$force = false) {
if(! strlen($s))
return $s;
- if(! strpos($s,'/profile/'))
+ if((! strpos($s,'/profile/')) && (! $force))
return $s;
+ if($force && substr($s,-1,1) !== '/')
+ $s = $s . '/';
$achar = strpos($s,'?') ? '&' : '?';
$mine = get_my_url();
if($mine and ! link_compare($mine,$s))
--
cgit v1.2.3