Merge pull request Elgg#10268 from mrclay/merge22

Merge 2.2 into 2.x

CHANGELOG.md

@@ -1,3 +1,43 @@
+<a name="2.2.1"></a>
+### 2.2.1  (2016-09-21)
+
+#### Contributors
+
+* Steve Clay (16)
+* iionly (5)
+* Ismayil Khayredinov (2)
+* Wouter van Os (1)
+
+#### Documentation
+
+* **license:** clarifies dual licensing in LICENSE.txt ([1db4994f](https://github.com/Elgg/Elgg/commit/1db4994f8bab11898153c4c9e6e2898c0549714f))
+* **support:** updates support policy and tentative release schedule ([71aab2c6](https://github.com/Elgg/Elgg/commit/71aab2c65c36265af2309954018806b91b40ecd8))
+
+
+#### Bug Fixes
+
+* **access:** updates no longer mistakenly blocked in some scenarios ([01f4f1df](https://github.com/Elgg/Elgg/commit/01f4f1df12d95c9828c5e7581b5352c7953e8109))
+* **boot:**
+  * boot cache now respects system cache setting ([f90b1eb1](https://github.com/Elgg/Elgg/commit/f90b1eb162968077be9d125437a8aa2e77e129ae))
+  * make sure boot cache updated when subtype data changes ([c80f6e64](https://github.com/Elgg/Elgg/commit/c80f6e64701320fdc83904719ca4bb2305079a5c))
+* **core:** boot no longer throws DB exception in some edge cases ([c7c44763](https://github.com/Elgg/Elgg/commit/c7c44763a58b41440fd5d1f321a511468018220f), closes [#10119](https://github.com/Elgg/Elgg/issues/10119))
+* **discussions:** removes site "Discussions" menu item added in 2.2.0 ([34678299](https://github.com/Elgg/Elgg/commit/346782993fbb3e5f6e5c56a6b16038cc4f6de275), closes [#9731](https://github.com/Elgg/Elgg/issues/9731))
+* **js:**
+  * output deprecation messages to admins in browser console only ([a8052f9c](https://github.com/Elgg/Elgg/commit/a8052f9cd5e2cbc120a6d5b7b3664049d569011e))
+  * popup no longer reopens after a second click on the trigger ([6dc8012b](https://github.com/Elgg/Elgg/commit/6dc8012b9bb4ca2c374b67f9cc88582bbd832a10), closes [#10063](https://github.com/Elgg/Elgg/issues/10063))
+* **likes:** don't emit notice if a listing's `$vars['list_class']` isn't set ([f2882158](https://github.com/Elgg/Elgg/commit/f2882158eed56c42c938b69d7e7caa53485284a5))
+* **members:** Don't rely on newest members tab set as default tab in pagehandler for members page ([a78aa354](https://github.com/Elgg/Elgg/commit/a78aa354ffa79f9f8fb90ad8aa3cccdf4554b034))
+* **pages:** operations keep track of more than 10 child pages ([bc5f414b](https://github.com/Elgg/Elgg/commit/bc5f414bf597fe440ca096333fafea330746a323))
+* **plugins:** Make activate/deactivate all plugins to work also on Firefox ([915865b9](https://github.com/Elgg/Elgg/commit/915865b9009bdbf9b47307ee908883874957cf0b))
+* **reportedcontent:** Reported Content admin widget works again ([739259fc](https://github.com/Elgg/Elgg/commit/739259fcb52e7400d1156635345067d381f36b6d), closes [#10151](https://github.com/Elgg/Elgg/issues/10151))
+* **river:** ensure unique comment form id ([80e508ae](https://github.com/Elgg/Elgg/commit/80e508ae1dc85db9aebb2b32dab904f1ea2b2674))
+* **ui:** hover menus no longer open outside viewport ([edd3740a](https://github.com/Elgg/Elgg/commit/edd3740a7203b8c287ae76b44fae1ec3e535fca1), closes [#10214](https://github.com/Elgg/Elgg/issues/10214))
+* **views:**
+  * input/select view can select options more reliably ([af103c7e](https://github.com/Elgg/Elgg/commit/af103c7ec700c2d6ca39f29e9ff57f71ef08447c), closes [#10154](https://github.com/Elgg/Elgg/issues/10154))
+  * some functions that use views fallback to default viewtype ([5a58317e](https://github.com/Elgg/Elgg/commit/5a58317eeee52e2a2e49df1a2f987c163ec25f93), closes [#10114](https://github.com/Elgg/Elgg/issues/10114))
+* **web_services:** create_api_user() and create_user_token() work again ([1ee8fe96](https://github.com/Elgg/Elgg/commit/1ee8fe9613435a637e2460b20e6b591541ae4039))
+
+
 <a name="2.2.0"></a>
 ## 2.2.0  (2016-08-05)
 

actions/profile/edit.php

@@ -88,6 +88,10 @@
 
 // go through custom fields
 if (sizeof($input) > 0) {
+
+	// fetch default access level for the user for use in fallback cases
+	$user_default_access = get_default_access($owner);
+
 	foreach ($input as $shortname => $value) {
 		$options = array(
 			'guid' => $owner->guid,
@@ -104,7 +108,7 @@
 				$access_id = (int) $accesslevel[$shortname];
 			} else {
 				// this should never be executed since the access level should always be set
-				$access_id = ACCESS_DEFAULT;
+				$access_id = $user_default_access;
 			}
 			if (is_array($value)) {
 				$i = 0;

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "elgg/elgg",
-    "version": "2.2.0",
+    "version": "2.2.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",
@@ -22,7 +22,7 @@
         "zendframework/zend-mail": "~2.4",
         "league/flysystem": "~1.0",
         "bower-asset/jquery": "^2.1.4",
-        "bower-asset/jquery-ui": "^1.11.4",
+        "bower-asset/jquery-ui": "1.11.*",
         "bower-asset/text": "^2.0.4",
         "bower-asset/requirejs": "^2.1.18",
         "bower-asset/jquery-form": "^3.51",

docs/appendix/support.rst

@@ -1,26 +1,43 @@
 Support policy
 ==============
 
-As of Elgg 1.9, each minor release gets:
- * Normal bugfixes every 2 weeks for 3 months, at which point the next minor release candidate is made available.
- * Security and critical (i.e. regression) bug fixes for 1 year from the date of the next stable minor release. These will be released on an as-needed basis.
+As of Elgg 2.0, each minor release receives bug and security fixes only until the next minor release.
+
+Long Term Support Releases
+--------------------------
+
+Within each major version, the last minor release is designated for long term support ("LTS") and will
+receive bug fixes until the 2nd following major version release, and security fixes until the 3rd
+following major version release.
+
+E.g. 1.12 is the last minor release within 1.x. It will receive bug fixes until 3.0 is released and
+security fixes until 4.0 is released.
+
+When bugs are found, a good faith effort will be made to patch the LTS release, but **not all fixes
+will be back-ported.** E.g. some fixes may depend on new APIs, break backwards compatibility, or require
+significant refactoring. If a fix risks stability of the LTS branch, it will not be included.
+
 
 .. seealso::
 
    :doc:`releases`
 
-Below is a table outlining the specifics for each release:
-
-+---------+----------------------+-------------------+------------------------+
-| Version | First stable release | Bug fixes through | Security fixes through |
-+=========+======================+===================+========================+
-| 1.8     | September 2011       | August 2014       | September 2015         |
-+---------+----------------------+-------------------+------------------------+
-| 1.9     | September 2014       | January 2015      | January 2016           |
-+---------+----------------------+-------------------+------------------------+
-| 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.
+Below is a table outlining the specifics for each release (future dates are tentative):
+
++----------+----------------------+-------------------+------------------------+
+| Version  | First stable release | Bug fixes through | Security fixes through |
++==========+======================+===================+========================+
+| 1.12 LTS | July 2015            | **Until 3.0**     | **Until 4.0**          |
++----------+----------------------+-------------------+------------------------+
+| 2.0      | December 2015        | March 2016        |                        |
++----------+----------------------+-------------------+------------------------+
+| 2.1      | March 2016           | June 2016         |                        |
++----------+----------------------+-------------------+------------------------+
+| 2.2      | June 2016            | September 2016    |                        |
++----------+----------------------+-------------------+------------------------+
+| 2.3 LTS  | September 2016       | **Until 4.0**     | **Until 5.0**          |
++----------+----------------------+-------------------+------------------------+
+| 3.0      | December 2016        |                   |                        |
++----------+----------------------+-------------------+------------------------+
+| 4.0      | December 2017        |                   |                        |
++----------+----------------------+-------------------+------------------------+

docs/contribute/money.rst

@@ -13,7 +13,7 @@ For only $50 per year for individuals or $150 per year for organizations,
 you can get listed as a supporter on `our supporters page`_.
 Elgg supporters are listed there unless they request not to be.
 
-.. _our supporters page: http://elgg.org/supporters.php
+.. _our supporters page: http://elgg.org/supporter.php
 
 Supporters are able to put this official logo on their site if they wish:
 

docs/guides/events-list.rst

@@ -33,6 +33,9 @@ System events
     might not be shown until after the process is completed. This means that any long-running
     processes will still delay the page load.
 
+.. note:: This event is prefered above using ``register_shutdown_function`` as you may not have access
+    to all the Elgg services (eg. database) in the shutdown function but you will in the event.
+
 **regenerate_site_secret:before, system**
     Return false to cancel regenerating the site secret. You should also provide a message
     to the user.

docs/guides/guidelines.rst

@@ -120,4 +120,5 @@ These points are good ideas, but are not yet in the official guidelines. Followi
 - Do not use the ``bundled`` category with your plugins. That is for plugins distributed with Elgg
 - Update functions deprecated in 1.8.
    - Many registration functions simply added an ``elgg_`` prefix for consistency
-   - See ``/engine/lib/deprecated-1.8.php`` for the full list. You can also set the debug level to warning to get visual reminders of deprecated functions
+   - See ``/engine/lib/deprecated-1.8.php`` for the full list. You can also set the debug level to warning to get visual reminders of deprecated functions
+- Don't use ``register_shutdown_function`` as you may not have access to certain Elgg parts anymore (eg database). Instead use the ``shutdown`` ``system`` event

docs/locale/pot/about.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Elgg master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-05 21:19-0400\n"
+"POT-Creation-Date: 2016-09-21 21:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

docs/locale/pot/admin.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Elgg master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-05 21:19-0400\n"
+"POT-Creation-Date: 2016-09-21 21:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

docs/locale/pot/appendix.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Elgg master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-05 21:19-0400\n"
+"POT-Creation-Date: 2016-09-21 21:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1430,101 +1430,119 @@ msgstr ""
 msgid "Support policy"
 msgstr ""
 
-#: ../../appendix/support.rst:6
-msgid "As of Elgg 1.9, each minor release gets:"
+#: ../../appendix/support.rst:4
+msgid "As of Elgg 2.0, each minor release receives bug and security fixes only until the next minor release."
 msgstr ""
 
-#: ../../appendix/support.rst:5
-msgid "Normal bugfixes every 2 weeks for 3 months, at which point the next minor release candidate is made available."
+#: ../../appendix/support.rst:7
+msgid "Long Term Support Releases"
 msgstr ""
 
-#: ../../appendix/support.rst:6
-msgid "Security and critical (i.e. regression) bug fixes for 1 year from the date of the next stable minor release. These will be released on an as-needed basis."
+#: ../../appendix/support.rst:9
+msgid "Within each major version, the last minor release is designated for long term support (\"LTS\") and will receive bug fixes until the 2nd following major version release, and security fixes until the 3rd following major version release."
 msgstr ""
 
-#: ../../appendix/support.rst:10
+#: ../../appendix/support.rst:13
+msgid "E.g. 1.12 is the last minor release within 1.x. It will receive bug fixes until 3.0 is released and security fixes until 4.0 is released."
+msgstr ""
+
+#: ../../appendix/support.rst:16
+msgid "When bugs are found, a good faith effort will be made to patch the LTS release, but **not all fixes will be back-ported.** E.g. some fixes may depend on new APIs, break backwards compatibility, or require significant refactoring. If a fix risks stability of the LTS branch, it will not be included."
+msgstr ""
+
+#: ../../appendix/support.rst:23
 msgid ":doc:`releases`"
 msgstr ""
 
-#: ../../appendix/support.rst:12
-msgid "Below is a table outlining the specifics for each release:"
+#: ../../appendix/support.rst:25
+msgid "Below is a table outlining the specifics for each release (future dates are tentative):"
 msgstr ""
 
-#: ../../appendix/support.rst:15
+#: ../../appendix/support.rst:28
 msgid "Version"
 msgstr ""
 
-#: ../../appendix/support.rst:15
+#: ../../appendix/support.rst:28
 msgid "First stable release"
 msgstr ""
 
-#: ../../appendix/support.rst:15
+#: ../../appendix/support.rst:28
 msgid "Bug fixes through"
 msgstr ""
 
-#: ../../appendix/support.rst:15
+#: ../../appendix/support.rst:28
 msgid "Security fixes through"
 msgstr ""
 
-#: ../../appendix/support.rst:17
-msgid "1.8"
+#: ../../appendix/support.rst:30
+msgid "1.12 LTS"
 msgstr ""
 
-#: ../../appendix/support.rst:17
-msgid "September 2011"
+#: ../../appendix/support.rst:30
+msgid "July 2015"
 msgstr ""
 
-#: ../../appendix/support.rst:17
-msgid "August 2014"
+#: ../../appendix/support.rst:30
+msgid "**Until 3.0**"
 msgstr ""
 
-#: ../../appendix/support.rst:17
-msgid "September 2015"
+#: ../../appendix/support.rst:30
+#: ../../appendix/support.rst:38
+msgid "**Until 4.0**"
 msgstr ""
 
-#: ../../appendix/support.rst:19
-msgid "1.9"
+#: ../../appendix/support.rst:32
+msgid "2.0"
 msgstr ""
 
-#: ../../appendix/support.rst:19
-msgid "September 2014"
+#: ../../appendix/support.rst:32
+msgid "December 2015"
 msgstr ""
 
-#: ../../appendix/support.rst:19
-#: ../../appendix/support.rst:21
-msgid "January 2015"
+#: ../../appendix/support.rst:32
+#: ../../appendix/support.rst:34
+msgid "March 2016"
 msgstr ""
 
-#: ../../appendix/support.rst:19
-msgid "January 2016"
+#: ../../appendix/support.rst:34
+msgid "2.1"
 msgstr ""
 
-#: ../../appendix/support.rst:21
-msgid "1.10"
+#: ../../appendix/support.rst:34
+#: ../../appendix/support.rst:36
+msgid "June 2016"
 msgstr ""
 
-#: ../../appendix/support.rst:21
-#: ../../appendix/support.rst:23
-msgid "April 2015"
+#: ../../appendix/support.rst:36
+msgid "2.2"
 msgstr ""
 
-#: ../../appendix/support.rst:21
-msgid "April 2016"
+#: ../../appendix/support.rst:36
+#: ../../appendix/support.rst:38
+msgid "September 2016"
 msgstr ""
 
-#: ../../appendix/support.rst:23
-msgid "1.11"
+#: ../../appendix/support.rst:38
+msgid "2.3 LTS"
 msgstr ""
 
-#: ../../appendix/support.rst:23
-msgid "July 2015"
+#: ../../appendix/support.rst:38
+msgid "**Until 5.0**"
 msgstr ""
 
-#: ../../appendix/support.rst:23
-msgid "July 2016"
+#: ../../appendix/support.rst:40
+msgid "3.0"
+msgstr ""
+
+#: ../../appendix/support.rst:40
+msgid "December 2016"
+msgstr ""
+
+#: ../../appendix/support.rst:42
+msgid "4.0"
 msgstr ""
 
-#: ../../appendix/support.rst:26
-msgid "We don't have a support policy for major releases (x.0.0) yet because we've never done one."
+#: ../../appendix/support.rst:42
+msgid "December 2017"
 msgstr ""