Merge pull request #8250 from mrclay/1x_into_master

Merging 1.x into master

README.md

@@ -1,4 +1,4 @@
-Elgg [![Build Status](https://secure.travis-ci.org/Elgg/Elgg.svg?branch=master)](https://travis-ci.org/Elgg/Elgg) [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/Elgg/Elgg/badges/quality-score.png?s=master)](https://scrutinizer-ci.com/g/Elgg/Elgg/?branch=master) [![Scrutinizer Code Coverage](https://scrutinizer-ci.com/g/Elgg/Elgg/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/Elgg/Elgg/?branch=master) [![Read the docs build status](https://readthedocs.org/projects/elgg/badge/?version=master)](http://learn.elgg.org/en/master/)
+Elgg [![Build Status](https://secure.travis-ci.org/Elgg/Elgg.svg?branch=1.11)](https://travis-ci.org/Elgg/Elgg) [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/Elgg/Elgg/badges/quality-score.png?s=1.11)](https://scrutinizer-ci.com/g/Elgg/Elgg/?branch=1.11) [![Scrutinizer Code Coverage](https://scrutinizer-ci.com/g/Elgg/Elgg/badges/coverage.png?b=1.11)](https://scrutinizer-ci.com/g/Elgg/Elgg/?branch=1.11) [![Read the docs build status](https://readthedocs.org/projects/elgg/badge/?version=1.11)](http://learn.elgg.org/en/1.11/)
 ====
 
 Copyright (c) 2008-2014, see COPYRIGHT.txt
@@ -18,7 +18,7 @@ The Elgg project was started in 2004 by
  - Dave Tosh (<https://twitter.com/davetosh>).
 
 Elgg is released under the GNU General Public License (GPL) Version 2 and the
-Massachusetts Institute of Technology (MIT-X11) License. See LICENSE.txt 
+Massachusetts Institute of Technology (MIT-X11) License. See LICENSE.txt
 in the root of the package you downloaded.
 
 For installation instructions, see INSTALL.txt.

actions/user/changepassword.php

@@ -25,7 +25,13 @@
 
 if (execute_new_password_request($user_guid, $code, $password)) {
 	system_message(elgg_echo('user:password:success'));
-	login(get_entity($user_guid));
+
+	try {
+		login(get_entity($user_guid));
+	} catch (LoginException $e) {
+		register_error($e->getMessage());
+		forward(REFERER);
+	}
 } else {
 	register_error(elgg_echo('user:password:fail'));
 }

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "elgg/elgg",
-    "version": "1.11.0-dev",
+    "version": "1.11.1",
     "description": "Elgg is an award-winning social networking engine, delivering the building blocks that enable businesses, schools, universities and associations to create their own fully-featured social networks and applications.",
     "license": "GPL-2.0",
     "minimum-stability": "dev",
@@ -46,4 +46,4 @@
         "squizlabs/php_codesniffer": "~1.5",
         "simpletest/simpletest": "~1.1"
     }
-}
+}

docs/admin/upgrading.rst

@@ -21,7 +21,7 @@ Advice
 Basic instructions
 ==================
 
-#. **Back up your database, data directory and code**
+#. **Back up your database, data directory, and code**
 #. Download the new version of Elgg from http://elgg.org
 #. Update the files
     * If doing a patch upgrade (1.9.x), overwrite your existing files with the new version of Elgg
@@ -37,9 +37,17 @@ Basic instructions
    Any modifications should have been written within plugins, so that they are not lost on overwriting.
    If this is not the case, take care to maintain your modifications. 
 
-.. note::
+From 1.10 to 1.11
+========================
 
-   If you modified the default .htaccess, be sure to port your modifications over to the new one.
+Breaking changes
+----------------
+In versions 1.9 and 1.10, names and values for metadata and annotations were not correctly trimmed
+for whitespace. Elgg 1.11 correctly trims these strings and updates the database to correct
+existing strings. If your plugin uses metadata or annotations with leading or trailing whitespace,
+you will need to update the plugin to trim the names and values. This is especially important if
+you are using custom SQL clauses or have hard-coded metastring IDs, since the update might change
+metastring IDs.
 
 From 1.8 to 1.9
 ===============

docs/appendix/releases.rst

@@ -9,7 +9,7 @@ In general, we adhere to `semantic versioning`_.
 
 Follow the blog to `stay up to date on the latest releases`__.
 
-__ http://blog.elgg.org
+__ https://community.elgg.org/blog/all
 
 Bugfix Releases (1.9.x)
 -----------------------

docs/appendix/roadmap.rst

@@ -18,7 +18,7 @@ by utilizing the following resources:
 .. _feedback and planning group: http://community.elgg.org/groups/profile/211069/feedback-and-planning
 .. _Github milestones: https://github.com/Elgg/Elgg/issues/milestones
 .. _Github pull requests: https://github.com/elgg/elgg/pulls
-.. _developer blog: http://blog.elgg.org
+.. _developer blog: https://community.elgg.org/blog/all
 
 Values
 ======

docs/appendix/support.rst

@@ -20,5 +20,7 @@ Below is a table outlining the specifics for each release:
 +---------+----------------------+-------------------+------------------------+
 | 1.10    | January 2015         | April 2015        | April 2016             |
 +---------+----------------------+-------------------+------------------------+
+| 1.11    | April 2015           | July 2015         | July 2016              |
++---------+----------------------+-------------------+------------------------+
 
 We don't have a support policy for major releases (x.0.0) yet because we've never done one.

docs/contribute/code.rst

@@ -602,22 +602,18 @@ Function expressions should end with a semi-colon.
 Deprecating APIs
 ================
 
-Occasionally, functions and classes must be deprecated in favor of newer replacements.
-Since 3rd party plugin authors rely on a consistent API,
-backward compatibility must be maintained,
-but will not be maintained indefinitely as
-plugin authors are expected to properly update their plugins.
-In order to maintain backward compatibility,
-deprecated APIs will follow these guidelines:
-
-* The first minor version (1.7) with a deprecated API must include a wrapper
-  function/class (or otherwise appropriate means) to maintain backward compatibility,
-  including any bugs in the original function/class.
-  This compatibility layer uses ``elgg_deprecated_notice('...', '1.7')``
+Occasionally functions and classes must be deprecated in favor of newer
+replacements. Since 3rd party plugin authors rely on a consistent API,
+backward compatibility must be maintained, but will not be maintained
+indefinitely as plugin authors are expected to properly update their plugins.
+In order to maintain backward compatibility, deprecated APIs will follow
+these guidelines:
+
+* Minor version (1.x) that deprecates an API must include a wrapper
+  function/class (or otherwise appropriate means) to maintain backward
+  compatibility, including any bugs in the original function/class.
+  This compatibility layer uses ``elgg_deprecated_notice('...', '1.11')``
   to log that the function is deprecated.
 
-* The following minor versions (1.8+) maintain the backward compatibility layer,
-  but ``elgg_deprecated_notice()`` will produce a visible warning.
-
 * The next major revision (2.0) removes the compatibility layer.
   Any use of the deprecated API should be corrected before this.

docs/contribute/releases.rst

@@ -16,7 +16,7 @@ Requirements
 
 * SSH access to elgg.org
 * Commit access to http://github.com/Elgg/Elgg
-* Author access to http://blog.elgg.org
+* Admin access to https://community.elgg.org/
 * Access to `Twitter account`_
 * Access to `G+ page`_
 * Node.js and NPM installed
@@ -119,7 +119,7 @@ Update homepage, download, and previous download pages
 
 This should be the very last thing you do.
 
-* Sign in at http://blog.elgg.org/pg/login and compose a blog on with HTML version of CHANGELOG.md.
+* Sign in at https://community.elgg.org/ and compose a blog on with HTML version of CHANGELOG.md.
 * Add tags “release” and “elgg1.x” where x is whatever branch is being released.
 * Tweet from the elgg `Twitter account`_
 * Post from the `G+ page`_