From d524ad8b59533a6b969f265b65f3a577dee82725 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Fri, 27 Feb 2015 09:57:49 +0100 Subject: [PATCH 1/2] Pass Profile to asAtomEntry --- lib/apiaction.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/apiaction.php b/lib/apiaction.php index d85029f433..e672f3a7e6 100755 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -788,7 +788,7 @@ class ApiAction extends Action function showSingleAtomStatus($notice) { header('Content-Type: application/atom+xml; charset=utf-8'); - print $notice->asAtomEntry(true, true, true, $this->auth_user); + print $notice->asAtomEntry(true, true, true, $this->auth_user->getProfile()); } function show_single_json_status($notice) From c81cd18796cb9208b9134b526d651ddc0db9edcd Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Fri, 27 Feb 2015 09:58:38 +0100 Subject: [PATCH 2/2] I hereby dub thee 1.1.3 - The Spanish Invasion --- lib/framework.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/framework.php b/lib/framework.php index c0c5146794..30b98d259f 100644 --- a/lib/framework.php +++ b/lib/framework.php @@ -23,11 +23,11 @@ define('GNUSOCIAL_ENGINE', 'GNU social'); define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/social/'); define('GNUSOCIAL_BASE_VERSION', '1.1.3'); -define('GNUSOCIAL_LIFECYCLE', 'beta3'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release' +define('GNUSOCIAL_LIFECYCLE', 'release'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release' define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE); -define('GNUSOCIAL_CODENAME', 'Not decided yet'); +define('GNUSOCIAL_CODENAME', 'The Spanish Invasion'); define('AVATAR_PROFILE_SIZE', 96); define('AVATAR_STREAM_SIZE', 48);