| [7051]
|
johnjamesjacoby
|
Forums: Code improvement to `bbp_list_forums()`.
This commit loosens the comparison on the `echo` array parameter into an `empty()` check, which will silence any debug notices that may happen if `bbp_after_list_forums_parse_args` is filtered to remove it.
Props Toengel. Fixes #3314. For 2.7, trunk.
|
| [7050]
|
netweb
|
Build Tools: Improve PHPCS setup.
Props jrf.
See #3294.
For trunk.
|
| [7049]
|
netweb
|
PHPCS: Pinking shears.
Props jrf.
See #3294.
For branches/2.6.
|
| [7048]
|
netweb
|
PHPCS: Pinking shears.
Props jrf.
See #3294.
For trunk.
|
| [7047]
|
netweb
|
PHPCS: Use Parenthesis when instantiating a new object.
Props jrf.
See #3294.
For branches/2.6.
|
| [7046]
|
netweb
|
PHPCS: Use Parenthesis when instantiating a new object.
Props jrf.
See #3294.
For trunk.
|
| [7045]
|
netweb
|
Build Tools: Update `svn:ignore` and `.gitignore`
• This commit is a follow up to [7038] to also ignore `.phpcs.xml`
Props jrf.
See #3294.
|
| [7044]
|
netweb
|
Build Tools: Update Travis CI config.
• Drop `apt: true` key
• Drop PHP 5.3 & 5.4 jobs
• Add PHP 7.3 & 7.4 jobs
• Drop WordPress 4.7, 4.8, & 4.9
• Add WordPress 5.2 & 5.3
• Ensure MySQL is available
• Exclude WP 5.2 from PHP 7.4 jobs
• Remove #bbpress-dev IRC notifications
• Remove deprecated `sudu: false` key
• Run BuddyPress Tests on all jobs
• Simplify PHPUnit Travis Grunt task
• Swap `dist: trusty` key to `os: linux` key
For branches/2.6.
|
| [7043]
|
netweb
|
Build Tools: Update Travis CI config.
• Drop `apt: true` key
• Drop PHP 5.3 & 5.4 jobs
• Add PHP 7.3 & 7.4 jobs
• Drop WordPress 4.7, 4.8, & 4.9
• Add WordPress 5.2 & 5.3
• Ensure MySQL is available
• Exclude WP 5.2 from PHP 7.4 jobs
• Remove #bbpress-dev IRC notifications
• Remove deprecated `sudu: false` key
• Run BuddyPress Tests on all jobs
• Simplify PHPUnit Travis Grunt task
• Swap `dist: trusty` key to `os: linux` key
For trunk.
|
| [7042]
|
netweb
|
SVN: Set `svn:mime-type` to `text/xml` for *.xml.dist files
|
| [7041]
|
netweb
|
Build Tools: Update SPDX License in `composer.json` to adhere to SPDX v3.0 specification.
|
| [7040]
|
netweb
|
Build Tools: Update SPDX License in `composer.json` to adhere to SPDX v3.0 specification.
|
| [7039]
|
netweb
|
Build Tools: Add project root `composer.json` file.
This commit adds the following Composer package developer dependencies:
• `phpcompatibility/phpcompatibility-wp`
• `wp-coding-standards/wpcs`
• `dealerdirect/phpcodesniffer-composer-installer`
This also adds two composer scripts:
• `composer lint` to "lint" the PHP files using PHPCS
• `composer format` to "format" the PHP files using PHPCBF
Props jrf.
See #3294.
|
| [7038]
|
netweb
|
Build Tools: Update `svn:ignore` and `.gitignore`
Props jrf.
See #3294.
|
| [7037]
|
johnjamesjacoby
|
Strings: improve consistency of "ERROR" messaging.
This commit moves a few colons from within their respective `<strong>` tag to outside of them, making them consistent with a few dozen other usages.
Props casiepa. Fixes #3302. For 2.7, trunk.
|
| [7036]
|
johnjamesjacoby
|
Strings: improve consistency of "ERROR" messaging.
This commit moves a few colons from within their respective `<strong>` tag to outside of them, making them consistent with a few dozen other usages.
Props casiepa. Fixes #3302. For 2.6.4, branches2.6.
|
| [7035]
|
johnjamesjacoby
|
Bump package version.
|
| [7034]
|
johnjamesjacoby
|
Make CSS linter happy again.
|
| [7033]
|
johnjamesjacoby
|
Make CSS linter happy again.
|
| [7032]
|
johnjamesjacoby
|
Users: move `_new_email` from options to usermeta.
This commit brings bbPress up-to-date with how WordPress tracks changes to email addresses. It includes a small bit of styling to add emphasis to the email address inside the standard notice wrapper.
See #3306. For 2.7, trunk.
|
| [7031]
|
johnjamesjacoby
|
Users: move `_new_email` from options to usermeta.
This commit brings bbPress up-to-date with how WordPress tracks changes to email addresses. It includes a small bit of styling to add emphasis to the email address inside the standard notice wrapper.
See #3306. For 2.6.4, branches/2.6.
|
| [7030]
|
johnjamesjacoby
|
Users: ensure topic & reply counts and last posted time are updated when user is spammed & hammed.
This commit ensures that these user meta values are correct when a user is marked (or unmarked) as a spammer. In addition, the newer topic status function is used to ensure that Closed topics are included.
See #3305. For 2.6.4, branches/2.6.
|
| [7029]
|
johnjamesjacoby
|
Users: ensure topic & reply counts and last posted time are updated when user is spammed & hammed.
This commit ensures that these user meta values are correct when a user is marked (or unmarked) as a spammer. In addition, the newer topic status function is used to ensure that Closed topics are included.
See #3305. For 2.7, trunk.
|
| [7028]
|
johnjamesjacoby
|
Users: register the `_bbp_last_posted` meta key.
This commit ensures that the meta key used to check if a user needs to be slowed down is registered.
See #3305. For 2.7, trunk.
|
| [7027]
|
johnjamesjacoby
|
Users: register the `_bbp_last_posted` meta key.
This commit ensures that the meta key used to check if a user needs to be slowed down is registered.
See #3305. For 2.6.4, branches/2.6.
|
| [7026]
|
johnjamesjacoby
|
Engagements: update cache groups in User strategy.
This commit makes all cache groups the same, and adds an inline comment about zero value object IDs. It also fixes a performance issue with pre-2.6 non-upgraded databases causing FIND_IN_SET queries not to be retrieved from cache correctly.
See #3292. For 2.6.4, branches/2.6.
|
| [7025]
|
johnjamesjacoby
|
Engagements: update cache groups in User strategy.
This commit makes all cache groups the same, and adds an inline comment about zero value object IDs. It also fixes a performance issue with pre-2.6 non-upgraded databases causing FIND_IN_SET queries not to be retrieved from cache correctly.
See #3292. For 2.7, trunk.
|
| [7024]
|
johnjamesjacoby
|
Engagements: fix bugs with caching implementation in User strategy.
This commit adds the `$object_id` to the end of the cache key, to avoid collisions with other IDs. It also loosens 2 explicit `true` comparisons because internal calls to `update_meta()` up the stack may return an integer.
See #3292. For 2.7, trunk.
|
| [7023]
|
johnjamesjacoby
|
Engagements: fix bugs with caching implementation in User strategy.
This commit adds the `$object_id` to the end of the cache key, to avoid collisions with other IDs. It also loosens 2 explicit `true` comparisons because internal calls to `update_meta()` up the stack may return an integer.
See #3292. For 2.6.4, branches/2.6.
|
| [7022]
|
johnjamesjacoby
|
Bump 2.6 branch to 2.6.4-alpha-1.
|
| [7021]
|
johnjamesjacoby
|
Set stable tag in readme.txt to 2.6.3.
|
| [7020]
|
johnjamesjacoby
|
Set stable tag in readme.txt to 2.6.3.
|
| [7019]
|
johnjamesjacoby
|
Tag 2.6.3.
|
| [7018]
|
johnjamesjacoby
|
Remove alpha designation from 2.6 branch, for 2.6.3.
|
| [7017]
|
johnjamesjacoby
|
Requirements: bump PHP version to 5.6.20.
This commit adds support for the "Requires PHP" readme tag, and also bumps the version for Composer.
Props jrf. Fixes #3298. For 2.7, trunk.
|
| [7016]
|
johnjamesjacoby
|
Requirements: bump PHP version to 5.6.20.
This commit adds support for the "Requires PHP" readme tag, and also bumps the version for Composer.
Props jrf. Fixes #3298. For 2.6.3, branches/2.6.
|
| [7015]
|
johnjamesjacoby
|
Converters: PHP7.4 code compatibility.
This commit uses the correct array syntax in the Invision converter, to avoid fatal erroring in PHP7.4+.
Props jrf. Fixes #3299. For 2.7, trunk.
|
| [7014]
|
johnjamesjacoby
|
Converters: PHP7.4 code compatibility.
This commit uses the correct array syntax in the Invision converter, to avoid fatal erroring in PHP7.4+.
Props jrf. Fixes #3299. For 2.6.3, branches/2.6.
|
| [7013]
|
johnjamesjacoby
|
Engagements: stop shouting.
This commit removes the last remaining exclamation mark from some engagements feedback.
Props casiepa. Fixes #3293. For 2.7, trunk.
|
| [7012]
|
johnjamesjacoby
|
Engagements: stop shouting.
This commit removes the last remaining exclamation mark from some engagements feedback.
Props casiepa. Fixes #3293. For 2.6.3, branches/2.6.
|
| [7011]
|
johnjamesjacoby
|
Replies: avoid stomping `t` in Reply JavaScript.
This commit fixes a bug causing the adminbar to become undefined, resulting in a JavaScript error that caused hierarchical replies not to work correctly.
Props Kipperlenny. Fixes #3301. For 2.6.3, branches/2.6.
|
| [7010]
|
johnjamesjacoby
|
Replies: avoid stomping `t` in Reply JavaScript.
This commit fixes a bug causing the adminbar to become undefined, resulting in a JavaScript error that caused hierarchical replies not to work correctly.
Props Kipperlenny. Fixes #3301. For 2.7, trunk.
|
| [7009]
|
johnjamesjacoby
|
Forums: revert the accidental reversal of the forums widget results order.
This commit makes sure that forums results are displayed in the expected ascending order, fixing a copy/paste regression introduced in 2.6.0.
Props netweb. Fixes #3295. See r6506. For 2.7, trunk.
|
| [7008]
|
johnjamesjacoby
|
Forums: revert the accidental reversal of the forums widget results order.
This commit makes sure that forums results are displayed in the expected ascending order, fixing a copy/paste regression introduced in 2.6.0.
Props netweb. Fixes #3295. See r6506. For 2.6.3, branches/2.6.
|
| [7007]
|
netweb
|
Build Tools: Follow to PHPCS changes in [7006]
- Fixes an erronous change in Invision converter
- Tweaks a readability issue in `bbp_update_reply()`
See #3294.
|
| [7006]
|
netweb
|
Build Tools: Add PHPCS with custom bbPress ruleset
- This changeset adds an initial bbPress PHPCS ruleset
- Future iteration of the rules in the ruleset can follow later
- To run the PHPCS check run `grunt phpcs
Fixes #3294.
|
| [7005]
|
johnjamesjacoby
|
Engagements: explicitly query for `-1` posts if no objects are known to exist.
This commit fixes an issue with the 2.5 User Engagements strategy that will cause all topics to be queried instead of none of them.
Revert r7002 and use a different syntax to avoid debug notices.
|
| [7004]
|
johnjamesjacoby
|
Engagements: explicitly query for `-1` posts if no objects are known to exist.
This commit fixes an issue with the 2.5 User Engagements strategy that will cause all topics to be queried instead of none of them.
Revert r7003 and use a different syntax to avoid debug notices.
|
| [7003]
|
johnjamesjacoby
|
Engagements: explicitly query for `-1` posts if no objects are known to exist.
This commit fixes an issue with the 2.5 User Engagements strategy that will cause all topics to be queried instead of none of them.
|
| [7002]
|
johnjamesjacoby
|
Engagements: explicitly query for `-1` posts if no objects are known to exist.
This commit fixes an issue with the 2.5 User Engagements strategy that will cause all topics to be queried instead of none of them.
|
| [7001]
|
johnjamesjacoby
|
Theme Compat: Revert `sans-serif` override from r6986.
This commit fixes a regression causing theme styling to to be applied, while also overriding some styling that was intentional.
|
| [7000]
|
johnjamesjacoby
|
Theme Compat: Revert `sans-serif` override from r6987.
This commit fixes a regression causing theme styling to to be applied, while also overriding some styling that was intentional.
|
| [6999]
|
johnjamesjacoby
|
Theme Compat: Don't override elements that are explicitly using `.dashicons`.
This commit prevents styling conflicts with third party plugins that are using Dashicons in elements.
See r6986.
|
| [6998]
|
johnjamesjacoby
|
Theme Compat: Don't override elements that are explicitly using `.dashicons`.
This commit prevents styling conflicts with third party plugins that are using Dashicons in elements.
See r6987.
|
| [6997]
|
johnjamesjacoby
|
Theme Compat: Add back original `ul` styling.
This commit fixes an unintentional styling change. The original rule should not have been removed.
See r6986.
|
| [6996]
|
johnjamesjacoby
|
Theme Compat: Add back original `ul` styling.
This commit fixes an unintentional styling change. The original rule should not have been removed.
See r6987.
|
| [6995]
|
johnjamesjacoby
|
Bump 2.6 branch to 2.6.3-alpha.
|
| [6994]
|
johnjamesjacoby
|
Bump packages.
|
| [6993]
|
johnjamesjacoby
|
Engagements: add caching to User strategy, for 2.5 compatibility.
This commit re-adds query caching for `FIND_IN_SET` queries, fixing long pageloads on sites with large amounts of usermeta that are unable to run the 2.6 database upgrade routine(s).
Props johnjamesjacoby, netweb. Fixes #3292. For 2.7, trunk.
|
| [6992]
|
johnjamesjacoby
|
Engagements: add caching to User strategy, for 2.5 compatibility.
This commit re-adds query caching for `FIND_IN_SET` queries, fixing long pageloads on sites with large amounts of usermeta that are unable to run the 2.6 database upgrade routine(s).
Props johnjamesjacoby, netweb. Fixes #3292. For 2.6.3, branches/2.6.
|
| [6991]
|
johnjamesjacoby
|
Locale: use correct singular versions, and format numeric results.
This commit fixes 2 typos causing plural versions of strings to appear where singulars should, and also makes sure that related numeric upgrade routine results are formatted.
Props webaware. Fixes #3290. For 2.6.3, branches/2.6.
|
| [6990]
|
johnjamesjacoby
|
Locale: use correct singular versions, and format numeric results.
This commit fixes 2 typos causing plural versions of strings to appear where singulars should, and also makes sure that related numeric upgrade routine results are formatted.
Props webaware. Fixes #3290. For 2.7, trunk.
|
| [6989]
|
johnjamesjacoby
|
Locale: fix an encoding typo.
This commit fixes a hard-to-see character encoding bug causing a right-quote to be incomplete in an admin-area Help Tab.
Props casiepa. Fixes #3291. For 2.7, trunk.
|
| [6988]
|
johnjamesjacoby
|
Locale: fix an encoding typo.
This commit fixes a hard-to-see character encoding bug causing a right-quote to be incomplete in an admin-area Help Tab.
Props casiepa. Fixes #3291. For 2.6.3, branches/2.6.
|
| [6987]
|
johnjamesjacoby
|
Theme Compat: more styling tweaks to default theme.
This commit adds more aggressive targeting to UL elements within the main `bbpress-forums` wrapper element, to ensure that themes choosing to also style unordered lists do not add margins & paddings to these default wrappers.
It also forces all default styling fonts to `sans-serif`, regardless of the parent theme. Serif fonts were never meant to be inherited, usually are difficult to read in small sizes, and many themes use broad styling for serifs that conflict with bbPress default styling elements.
Includes a few responsive improvements for smaller screens where author information gets displayed vertically.
For 2.6.3, branches/2.6.
|
| [6986]
|
johnjamesjacoby
|
Theme Compat: more styling tweaks to default theme.
This commit adds more aggressive targeting to UL elements within the main `bbpress-forums` wrapper element, to ensure that themes choosing to also style unordered lists do not add margins & paddings to these default wrappers.
It also forces all default styling fonts to `sans-serif`, regardless of the parent theme. Serif fonts were never meant to be inherited, usually are difficult to read in small sizes, and many themes use broad styling for serifs that conflict with bbPress default styling elements.
Includes a few responsive improvements for smaller screens where author information gets displayed vertically.
|
| [6985]
|
johnjamesjacoby
|
Subscriptions: correct a typo when a failure occurs.
Props webaware. Fixes #3289. For 2.7, trunk.
|
| [6984]
|
johnjamesjacoby
|
Subscriptions: correct a typo when a failure occurs.
Props webaware. Fixes #3289. For 2.6.3, branches/2.6.
|
| [6983]
|
johnjamesjacoby
|
Tag 2.6.2.
|
| [6982]
|
johnjamesjacoby
|
BuddyPress: return the original content on non-reply actions.
This commit fixes a regression causing BuddyPress notifications to be broken in #3036.
Props tw2113. Fixes #3287. For 2.6.2, branches/2.6.
|
| [6981]
|
johnjamesjacoby
|
BuddyPress: return the original content on non-reply actions.
This commit fixes a regression causing BuddyPress notifications to be broken in #3036.
Props tw2113. Fixes #3287. For 2.7, trunk.
|
| [6980]
|
johnjamesjacoby
|
Replies: Tell jshint to ignore some internals in scrollToForm() function.
This commit silences some noise from our Grunt processes.
For 2.7, trunk.
|
| [6979]
|
johnjamesjacoby
|
Replies: Tell jshint to ignore some internals in scrollToForm() function.
This commit silences some noise from our Grunt processes.
For 2.6.2, branches 2.6.
|
| [6978]
|
johnjamesjacoby
|
Bump versions to 2.6.2.
|
| [6977]
|
netweb
|
Tools: Correct string in repair topic reply count tool.
Props felipeloureirosantos.
See #3288. For 2.6.2, branches/2.6.
|
| [6976]
|
netweb
|
Tools: Correct string in repair topic reply count tool.
Props felipeloureirosantos.
See #3288. For 2.7, trunk.
in bbp_admin_repair_topic_reply_count
|
| [6975]
|
johnjamesjacoby
|
Capabilities: break instead of return.
This commit ensures that the relative _meta_caps filters continue to be executed within their expected contexts.
Previous to this change, certain mapped capability checks would bail out early and return $caps without the ability to filter the results.
With this change, mapped capabilities can now be filtered more logically and inline with the rest of the surrounding logic.
For 2.7, trunk.
|
| [6974]
|
johnjamesjacoby
|
Moderation: flip strict condition in `bbp_check_for_blacklist()`.
This commit fixes a bug causing old calls to `bbp_check_for_blacklist()` to use the incorrect discussion setting values.
|
| [6973]
|
johnjamesjacoby
|
Moderation: flip strict condition in `bbp_check_for_blacklist()`.
This commit fixes a bug causing old calls to `bbp_check_for_blacklist()` to use the incorrect discussion setting values.
|
| [6972]
|
johnjamesjacoby
|
Capabilities: break instead of return;
This commit ensures that the relative `_meta_caps` filters continue to be executed within their expected contexts.
Previous to this change, certain mapped capability checks would bail out early and return `$caps` without the ability to filter the results.
With this change, mapped capabilities can now be filtered more logically and inline with the rest of the surrounding logic.
For 2.6.2.
|
| [6971]
|
johnjamesjacoby
|
Docs: add note to `bbp_get_excluded_forum_ids()` about per-forum moderators.
|
| [6970]
|
johnjamesjacoby
|
Add a new line where there should be one.
|
| [6969]
|
johnjamesjacoby
|
Default Styling: Optionally support an RTL variant of bbpress.css.
This commit allows for either/or `bbpress.css` or `bbpress-rtl.css` to exist and be enqueued as styling in the template stack, fixing a regression from 2.6.0 where the RTL CSS was expected to be appended to the end of the file.
This allows for both files to be included if they both exist, or one of them if only one does, effectively covering all bases for 2.5 and 2.6 support.
Props scmsteve for persistence. Fixes #3218. For 2.6.2, branches/2.6.
|
| [6968]
|
johnjamesjacoby
|
Default Styling: Optionally support an RTL variant of bbpress.css.
This commit allows for either/or `bbpress.css` or `bbpress-rtl.css` to exist and be enqueued as styling in the template stack, fixing a regression from 2.6.0 where the RTL CSS was expected to be appended to the end of the file.
This allows for both files to be included if they both exist, or one of them if only one does, effectively covering all bases for 2.5 and 2.6 support.
Props scmsteve for persistence. Fixes #3218. For 2.7, trunk.
|
| [6967]
|
johnjamesjacoby
|
Slugs: add support for configuring the "Edit" slug.
This commit adds supporting functions and UI for allowing the `edit` slug to be modified. This omission was originally intentional, as the rewrite rules and pretty permalink support were not fully implemented. Now that they are in 2.6, there is no reason not to allow this slug to be modified.
Related changes include swapping out the new slug setting for the rewrite ID in a few places, and removing a single hardcoded reference to `'edit'` that was also overlooked.
Props espellcaste for noticing. Fixes #3285. For 2.7, trunk.
|
| [6966]
|
johnjamesjacoby
|
Slugs: add support for configuring the "Edit" slug.
This commit adds supporting functions and UI for allowing the `edit` slug to be modified. This omission was originally intentional, as the rewrite rules and pretty permalink support were not fully implemented. Now that they are in 2.6, there is no reason not to allow this slug to be modified.
Related changes include swapping out the new slug setting for the rewrite ID in a few places, and removing a single hardcoded reference to `'edit'` that was also overlooked.
Props espellcaste for noticing. Fixes #3285. For 2.6.2, branches/2.6.
|
| [6965]
|
johnjamesjacoby
|
Replies: ensure visual editor works correctly with hierarchical replies.
This commit updates reply.js in the default theme to include a bit of element juggling that prevents TinyMCE from freezing up when it is relocated on the page.
Before this commit, clicking "Reply" while having the Visual Editor enabled would cause it to not be able to be typed inside of. Now, when clicking commit, TinyMCE is correctly reinvoked in its new location, and the page will expediently scroll to that new position, fixing a related UX bug where it was possible for the reply form to get lost inside of deep hierarchies.
Props chherbst. Fixes #2646. For 2.6.2, branches/2.6.
|
| [6964]
|
johnjamesjacoby
|
Replies: ensure visual editor works correctly with hierarchical replies.
This commit updates reply.js in the default theme to include a bit of element juggling that prevents TinyMCE from freezing up when it is relocated on the page.
Before this commit, clicking "Reply" while having the Visual Editor enabled would cause it to not be able to be typed inside of. Now, when clicking commit, TinyMCE is correctly reinvoked in its new location, and the page will expediently scroll to that new position, fixing a related UX bug where it was possible for the reply form to get lost inside of deep hierarchies.
Props chherbst. Fixes #2646. For 2.7, trunk.
|
| [6963]
|
netweb
|
Theme Compat: Remove duplicate `border-radius` added in [6952]
See #3281. For 2.7, trunk.
|
| [6962]
|
netweb
|
Build Tools: Cache `node_modules` folder in Travis CI
Fixes #2885.
|
| [6961]
|
johnjamesjacoby
|
Reduce number of tags in readme.txt.
|
| [6960]
|
johnjamesjacoby
|
Reduce number of tags in readme.txt.
|
| [6959]
|
johnjamesjacoby
|
Replace extensive changelog with a single link to the Codex.
Props casiepa (for trunk)
|
| [6958]
|
johnjamesjacoby
|
Replace extensive changelog with a single link to the Codex.
Props casiepa.
|
| [6957]
|
johnjamesjacoby
|
Tag 2.6.1.
|
| [6956]
|
johnjamesjacoby
|
Theme Compat: Fix CSS overlapping border-radius from r6951.
Also bump package-lock.json.
|
| [6955]
|
johnjamesjacoby
|
Settings: revert accidental string change from r6485.
Fixes #3279. Props SergeyBiryukov. For 2.6.1, branches/2.6.
|
| [6954]
|
johnjamesjacoby
|
Settings: revert accidental string change from r6485.
Fixes #3279. Props SergeyBiryukov. For 2.7, trunk.
|
| [6953]
|
johnjamesjacoby
|
Author Links: remove default non-breaking space.
This commit fixes an inconsistency with author links, causing whitespace in some places but not others.
See #3281. For 2.7, trunk.
|
| [6952]
|
johnjamesjacoby
|
Theme Compat: resolve a number of issues brought up after 2.6 was released.
This commit does the following:
* Sets min and max heights on img.avatar elements to avoid them being super huge in Twenty Twenty
* Restores text-underline styling for topic & reply content for Twenty Seventeen
* Removes text-underline for revisions
* Fixes padding & margins on small screens across all themes
See #3281. For 2.7, trunk.
|