Squashed 'php/' changes from b5532fc..8eaa0c3

a29424b Merge tag '7.26'
3feb832 committing default.settings.php.
48f8cea Merge tag 'refs/tags/7.25'
dc791ec Drupal 7.26
effed1c Drupal 7.25
6de5659 Fix broken function docblock in system.install.
031c13e Grammar consistency fix in CHANGELOG.txt.
8ef1386 Add standard information to CHANGELOG.txt in preparation for Drupal 7.25.
5a10f6f Added link to the change notification for the new Statistics module feature from issue #1209532.
ccec3e9 Issue #2051787 by milesw: Document that caches should be cleared after calling field_attach_update().
9a0f281 Issue #1876546 by plopesc, Kevin Morse | joachim: Node_type_form_validate() and node_type_form_submit() pointlessly trim machine name value.
427ae62 Issue #1182374 by lyricnz, sivaji, brianV: Code style fixes for includes/filetransfer.
e04e530 Issue #2117601 by Alan D.: Namespaced Drupal\node\Node entity in node_revision_list() doc comment rather than node.
a4a72dc Issue #1146244 by Dean Reilly, klausi, fago, firebird, David_Rothstein, aaronbauman, shenzhuxi, jaanhoinatski, themoep, citlacom: Node_access integrity constraint violation on module_invoke_all('node_' . $op, $node);.
cb7127c Issue #1760330 by s.Daniel, David_Rothstein, jfhovinne: Hide vulnerable drupal install.php sites from search engines.
aa6235c Issue #805236 by merrillholt, ekl1773, marcingy, sun, catch: Cache the query in menu_local_tasks().
67ad400 Issue #1252206 by sivaji, droplet, kid_icarus, Bojhan: Remove checkbox spacing.
70e0b16 Issue #937284 by chx, chrisdolby, deviantintegral, Berdir, tim.plunkett | hefox: DEADLOCK errors on MergeQuery INSERT due to InnoDB gap locking when condition in SELECT ... FOR UPDATE results in 0 rows.
ddba1d9 Issue #1201088 by crazyrohila, pjcdawkins, eiriksm, Zgear, barbi | alxsvdr: Drupal_environment_initialize() passes wrong ini_set parameter.
25875f9 Issue #1798066 by boztek, dcam, larowlan | Anonymous: Clean up CommentTestBase::setCommentSettings().
4ed2cfc Issue #1480734 by kotnik: Useless require_once file in st().
31d124b Issue #1693336 by chx, David_Rothstein, catch | iamEAP: Block rehashing happens on every cron run.
e868ee8 Issue #2136369 by marvil07: Provide a way to avoid processing a queue during cron execution.
226fe69 Issue #1076132 by fizk, friesk, foxtrotcharlie, coolestdude1, David_Rothstein, skwashd, alexpott, tstoeckler | adaddinsane: Hook_block_view_MODULE_DELTA_alter fails with blocks that have a hyphen in the block delta.
6cd1aae Issue #1476810 by Spleshka, David_Rothstein, franz | Heine: Drupal_serve_page_from_cache can serve uncompressed data with Content-Encoding gzip header with page_cache_without_database = 1.
001532a Issue #2054205 by pfrenssen, Berdir: Broken Tests on PHP 5.5.
f362e6a Issue #2018791 by droplet | gagarine: States.js is not compatible with jquery +1.6.1 because it use $.attr in the wrong way.
0b1196b Issue #1563620 by donquixote, David_Rothstein, chaby: Fix errors running unit tests in Drupal 7 when the Locale module is enabled.
b5f311a Issue #1443158 by agentrickard, Dave Reid, marcingy: File_field_presave assumes that a file object has been loaded.
257fac8 Issue #1426122 by deletedaccount, Alan D., andypost, maximpodorov: Some callbacks return junk when calling drupal_not_found(); replace with return MENU_NOT_FOUND instead.
987892b Issue #2120461 by amitsedaiz | joachim: Theme_status_report() uses an integer instead of a constant.
df93dd2 Issue #1841900 by olli, herom, Sheldon Rampton: Node deletion should clear page cache.
d453b28 Issue #2127835 by zterry95: Fix code format in user.module.
16fe2e9 Issue #1198904 by das-peter, jox: Drupal_load_stylesheet() fails to load @import files in different directories.
97ba84c Remove issue #1289336 from CHANGELOG.txt for now, since it was causing test failures.
1518a55 Revert "Issue #1289336 by jthorson, JimmyAx, marcingy, no_commit_credit, rooby | janipuni: Calling node_view for the same node with multiple view modes on the same page does not correctly attach fields."
a009ee6 Issue #1269166 by mgifford | hass: PRE tags (and other similar tags) have unreadable small font-size in Bartik.
273c78d Issue #2078917 by sun: E-mails contain double spaces in soft-wrapped sentences.
bb74649 Issue #1504522 by rahulbile, Chi: Strict warning: Only variables should be passed by reference in update_results_page().
663d464 Add issue #1289336 to CHANGELOG.txt.
850c6e3 Issue #1289336 by jthorson, JimmyAx, marcingy, no_commit_credit, rooby | janipuni: Calling node_view for the same node with multiple view modes on the same page does not correctly attach fields.
70e25d7 Issue #2090207 by helmo, davidhunter, Tor Arne Thune: Undefined property: stdClass::$visibility in profile_view_field().
c004926 Issue #1970588 by Heine: SearchExcerptTestCase should be a DrupalWebTestCase.
66a58e4 Issue #2016497 by naxoc, jhodgdon | plachance: Search query extender should not use floats directly.
18d4eaa Issue #1955378 by skek, Darren Oh, claudiu.cristea, David_Rothstein: Return same derivative token with path or URI.
1f7dc27 Issue #1993728 by johnmcc, pfrenssen: TestMenuTreeData() assert message confuses dashes and underscores.
1bcc0e3 Issue #1209532 by timmillwood, lucascaro, wiifm, iamEAP, sdrycroft, mikeytown2 | slashrsm: Count node views via AJAX in the statistics module.
cc20016 Issue #813634 by jlscott, cafuego, Nitesh Sethia, claudinec, brianV: Node.language column should have an index.
a5a14f9 Issue #2079315 by mondrake: Image style editing leads to redundant watchdog entries.
08c9538 Issue #1982020 by Fabianx, FreekyMage, Cottser: Add static caching to drupal_html_class().
1f3e78c Issue #1996644 by apkwilson, abghosh82 | joachim: User_login_name_validate() uses isset() where other user login form validation handlers use !empty().
6331211 Issue #2011918 by jesse.d, Liam Morland, scor: Titles are often double-escaped (including in the content attribute of the dc:title meta element for nodes).
94a26aa Issue #2040209 by WebEvt: CSS is truncated when aggregation is turned on.
5808159 Issue #310315 by superspring, justafish, naxoc, Waltemath | fonant: drupal_wrap_mail() strips trailing blanks from standard hyphen-hyphen-space-newline e-mail signature separator.
59b82ed Issue #2064667 by kboopathi | Charles Belov: PHP Filter has a broken link to "Example PHP snippets" within help.
76bc39e Issue #1414368 by coolestdude1, Dave Reid: Drupal_http_request does not handle basic auth correctly when dealing with blank passwords.
998ec18 Issue #1346098 by benjy | joachim: Standard install profile sets a pointless $vocabulary->help.
7b029ac Issue #1679660 by rhm50, amontero, billk2, valthebald | bagvendt: Add link to cron tutorial on drupal.org.
335b2da Issue #1399798 by nevergone, amateescu, chriscohen: Add a variable to allow the anonymous user object to not be a stdClass and to work around the fact that anonymous user properties are hardcoded.
cbabb1a Issue #2056363 by yched, Sweetchuck, chx: INSERT INTO table SELECT * FROM ... not supported.
6c89f39 Issue #1815886 by bojanz, slashrsm | torgosPizza: Change the database schema to allow Drupal core to manage files larger than 4 GB.
fe2e820 Added issue #2066275 to CHANGELOG.txt.
97069e4 Issue #1683794 by JacobSanford, somepal, Caligan: Fix docs for user_block_user_action() function
92ebe7f Issue #1820086 by gcassie: Remove mention of drupal_session_count() from inline documentation.
c1b6dc1 Issue #2145077 by TR: Fix spelling errors in D7 tests and comments
1bab4b4 Merge branch 'pressflow-7.24'
0fed473 Merge tag 'tags/7.24' into pressflow-7.24
f01c994 Merge tag '7.24' into 7.x
782d115 Drupal 7.24
3611e16 Issue #2129867 by ar-jan: Fix HTML formatting in drupal_add_js docs.
43fcd14 Issue #1665446 by sivaji, kostajh, markpavlitski: Fix documentation for user_pass_rehash and related functions
099daac Issue #2084535 by sivaji, mErilainen, tankerjoe, DanielFbrg: Fix docs for file_copy
8fbfff2 Issue #1947766 by pfrenssen: Fix docs for user_page() function
ae919db Issue #332518 by diego21, joachim, chriscohen: Fix up documentation for system_settings_form().
2912a88 Issue #1345654 by diego21, joachim: Make sure hook_field_info tells you there are other needed hooks
3c2464e Issue #1517032 by damiankloip, covenantd: Fix search-result.tpl.php docs
a6a8a9f Issue #2109957 by ar-jan, joachim: Clarify docs for hook_field_schema()
ed1df8f Issue #2105237 by StephaneQ: Remove innacurate line in stream wrapper class docs
a8b2b4e Issue #2046677 by drumm | tvn: Fixed Strict warning: Creating default object from empty value in template_preprocess_profile_listing().
2cd4323 Allow subsecond delays for lock_wait().
ace62d6 Issue #2078101 by Xano: Update cpyright date
a44bda7 Issue #692366 by  mariacha1, hosef, Albert Volkman, xjm, underq, kid_icarus, willmoy, bradweikel: Replace US-centric php.net URLs with language-neutral URLs
9b377a4 Issue #2061275 by StephaneQ, cconrad: Do not confuse hook_cron_queue_info with hook_cron in docs
1deabbd Issue #2062399 by kattekrab, Kartagis, effulgentsia, cafuego, Damien Tournoud, beejeebus, Dries, cweagans, webchick: Add Percona to list of supported MySQL-like databases
15d059e Issue #1977054 by ebargtuo, dooug: Make docs for language API callbacks match the code
b38421c Issue #2066275 by Dave Reid: Fixed file_field_load() overwites any field item properties with file entity properties.
de79105 Issue #2059785 by kiamlaluno, longwave: Fix punctuation in field_view_field() docs
b84232e Issue #2062127 by jlindsey15, joachim: Document system_requirements as implementation of hook_requirements
8bc33bd Issue #2061545 by StephaneQ, rterrein: Add missing ampersand in sample hook_dashboard_regions_alter function body
493eb8f Issue #2061843 by TravisCarden: Clean up the docs for hook_schema
83c329f Issue #2044791 by skipyT, alexandre.todorov, joachim: Clarify documentation of hook_block_view around empty return values
4c67cb9 Issue #1967802 by ebargtuo: Fix documentation of block view alter hooks
479fe52 Issue #2059685 by StephaneQ, Cottser: Remove t() from test assertion messages in dashboard module
bb40292 Issue #2059687 by StephaneQ, Cottser: Remove t() from test assertion messages in blog module
a9de02a Issue #2059689 by StephaneQ, dcam: Remove t() from test assertion messages in profile module
f66c77e Issue #2059691 by StephaneQ, dcam: Remove t() from test assertion messages in trigger module
08d5d09 Back to 7.x-dev

git-subtree-dir: php
git-subtree-split: 8eaa0c39d57d506d4a540f02d627cfe69a03356f
Merge commit '1ef7b132bc145ec955d6eb18487506985683ef1f'
Update README about subtree merges.
Add in action_hooks from the OpenAtrium 2 Quickstart.
Fix post_start_php hook.