Merge branch 'master' of gitorious.org:social/mainline

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/README.md b/README.md
index 3d0e101d69f326d5c8d878ece6b92c9a89b90887..714195d240ad041f33989df357d325df803612c1 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# GNU social 1.1.3 (beta3)
-February 2015
+# GNU social 1.1.3
+February 2015-02-27
 
 (c) Free Software Foundation, Inc
 (c) StatusNet, Inc

diff --git a/doc-src/contact b/doc-src/contact
index 4b31439c42de9ae70962bcc40f67e50d70201d4e..9187034edeefc525d05a66c2fb48a82854e10471 100644 (file)
--- a/doc-src/contact
+++ b/doc-src/contact
@@ -8,9 +8,9 @@ people for %%site.name%%.
 Bugs
 ----
 
-If you think you've found a bug in the [StatusNet](http://status.net/) software,
-or if there's a new feature you'd like to see, add it into the [StatusNet bug database](http://status.net/bugs/). Don't forget to check the list of
-existing bugs to make sure it hasn't already been reported!
+If you think you've found a bug in the underlying [GNU social](https://gnu.io/social/) software,
+or if there's a new feature you'd like to see, add it into the [GNU social task list](https://bugz.foocorp.net/).
+Don't forget to check the list of existing bugs to make sure it hasn't already been reported!
 
 Email
 -----
@@ -20,7 +20,6 @@ You can reach the responsible party for this server at [%%site.email%%](mailto:%
 Post a notice
 -------------
 
-If you have a question about how to do something, just post a notice
-with your question. Watch your inbox [public timeline](%%action.top%%)
-for answers.
+If you have a question about how to do something, just post a notice with
+your question, preferrably tagged with #NewHere. Watch your inbox for replies.
 

diff --git a/lib/apiaction.php b/lib/apiaction.php
index d85029f4336ade4e9418afad4e7df32fcdf0eac2..e672f3a7e6044b1a717782bceb42cc9247578d73 100755 (executable)
--- 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)

diff --git a/lib/framework.php b/lib/framework.php
index 283453f8eb2ed3251f3a2af63efd153df3178236..6e71fea62cbf5773852aa66725772e27192d4cf7 100644 (file)
--- 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);