diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 392826d22f778675af67c168bd2b2deb14ea45bd..4adf5a43c530b2e1bffe15ed79b4e2f34895c395 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,7 @@ +Drupal 7.63, 2019-01-16 +----------------------- +- Fixed a fatal error for some Drush users introduced by SA-CORE-2019-002. + Drupal 7.62, 2019-01-15 ----------------------- - Fixed security issues: diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 7734840dc6b66b5721bbc1f878845b2a393d88e9..f484fce2651f3dd088dff2b84c8d4f0589022f31 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -8,7 +8,7 @@ /** * The current system version. */ -define('VERSION', '7.62'); +define('VERSION', '7.63'); /** * Core API compatibility. diff --git a/misc/typo3/drupal-security/PharExtensionInterceptor.php b/misc/typo3/drupal-security/PharExtensionInterceptor.php index a77e9f84c267cfa2b180db38792b989a80580a23..2e1a0cbc8bb1722476c0c2c5101f2177d32a7ae5 100644 --- a/misc/typo3/drupal-security/PharExtensionInterceptor.php +++ b/misc/typo3/drupal-security/PharExtensionInterceptor.php @@ -22,7 +22,6 @@ class PharExtensionInterceptor implements Assertable { * * @param string $path * The path of the phar file to check. - * * @param string $command * The command being carried out. * @@ -46,6 +45,8 @@ class PharExtensionInterceptor implements Assertable { } /** + * Determines if a path has a .phar extension or invoked execution. + * * @param string $path * The path of the phar file to check. * @@ -62,8 +63,13 @@ class PharExtensionInterceptor implements Assertable { // not not have .phar extension then this should be allowed. For // example, some CLI tools recommend removing the extension. $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); - $caller = array_pop($backtrace); - if (isset($caller['file']) && $baseFile === $caller['file']) { + // Find the last entry in the backtrace containing a 'file' key as + // sometimes the last caller is executed outside the scope of a file. For + // example, this occurs with shutdown functions. + do { + $caller = array_pop($backtrace); + } while (empty($caller['file']) && !empty($backtrace)); + if (isset($caller['file']) && $baseFile === Helper::determineBaseFile($caller['file'])) { return TRUE; } $fileExtension = pathinfo($baseFile, PATHINFO_EXTENSION); diff --git a/pantheon-yml.patch b/pantheon-yml.patch index dfa5c4ffa6f5a6a2b06245e1bb3c846379cf5e4c..f65fc452e862d15a60fa5e99a5c68c029cafedd9 100644 --- a/pantheon-yml.patch +++ b/pantheon-yml.patch @@ -6,7 +6,7 @@ index 0000000..25f0f6d @@ -0,0 +1,12 @@ +api_version: 1 + -+php_version: 5.6 ++php_version: 7.1 + +drush_version: 7 + diff --git a/pantheon.yml b/pantheon.yml index dea3a030674942d68ab864b7692a3d7ec8e9e317..d247dc1b425f001f1b9c84758aeed12128b060ad 100644 --- a/pantheon.yml +++ b/pantheon.yml @@ -1,6 +1,6 @@ api_version: 1 -php_version: 5.6 +php_version: 7.1 drush_version: 7 diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt index 9c808d4c2a2062043391ef402139ac30c240a2e5..1f722441c82cde1ae1a13e89fcc1f386bd440d45 100644 --- a/profiles/wcm_base/CHANGELOG.txt +++ b/profiles/wcm_base/CHANGELOG.txt @@ -1,3 +1,9 @@ +WCM Base 7.x-1.11-rc1, 2019-01-23 +--------------------------------- +- WCM Base: + - Upgraded PHP to 7.1 + - Updated Panopoly to 1.59. + WCM Base 7.x-1.10, 2019-01-16 ----------------------------- - WCM Base: Updated Drupal core to 7.62 per SA-CORE-2019-001. diff --git a/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt index d90a041dd379b5507b4c60e7d1983de00cd2f86f..785185a142da2b139ef90aadcbabdbbba80c3fb7 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt +++ b/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt @@ -1,3 +1,7 @@ +7.x-1.59, 2019-01-17 +------------------- +- No changes since last release. + 7.x-1.58, 2018-12-11 ------------------- - Patch admin_menu to remove PHP 7 deprecation warning. diff --git a/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info b/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info index f19dc6c2870b6aec4c8e8132f1db65ef0bed1d02..9dbcdc61d7d623f83d548a49932142fb5e740f67 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info +++ b/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info @@ -37,8 +37,8 @@ features[page_manager_pages][] = panopoly_admin_layout_library features[page_manager_pages][] = panopoly_admin_page_library features[page_manager_pages][] = panopoly_admin_pane_library -; Information added by Drupal.org packaging script on 2018-12-12 -version = "7.x-1.58" +; Information added by Drupal.org packaging script on 2019-01-17 +version = "7.x-1.59" core = "7.x" project = "panopoly_admin" -datestamp = "1544590687" +datestamp = "1547743824" diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt index 517e85528afeecf10cf6d9de1fb9ec75646c8e2b..fc1e6dd50917c909a27309a31a17e245051516ea 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt +++ b/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt @@ -1,3 +1,7 @@ +7.x-1.59, 2019-01-17 +------------------- +- No changes since last release. + 7.x-1.58, 2018-12-11 ------------------- - Patch defaultcontent module to remove PHP7 deprecation warning. diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info index 4600bfa4c22b61b040702a8e25bc928a78b536b6..30650a11e97e2fefc170e058ea4ca6d21110a65f 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info +++ b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info @@ -82,8 +82,8 @@ features_exclude[variable][panelizer_taxonomy_term:panopoly_categories_allowed_t features_exclude[variable][panelizer_defaults_taxonomy_term_panopoly_categories] = panelizer_defaults_taxonomy_term_panopoly_categories features_exclude[variable][pathauto_taxonomy_term_panopoly_categories_pattern] = pathauto_taxonomy_term_panopoly_categories_pattern -; Information added by Drupal.org packaging script on 2018-12-12 -version = "7.x-1.58" +; Information added by Drupal.org packaging script on 2019-01-17 +version = "7.x-1.59" core = "7.x" project = "panopoly_core" -datestamp = "1544590701" +datestamp = "1547743843" diff --git a/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt index a197e9dd55d638618c7e7028af6dc776057bc627..bb5b8149f572142da3f189da167c24d504ffb224 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt +++ b/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt @@ -1,3 +1,7 @@ +7.x-1.59, 2019-01-17 +------------------- +- No changes since last release. + 7.x-1.58, 2018-12-11 ------------------- - Allow overriding "more" text on Views-based widgets. diff --git a/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info b/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info index 36cbb348d57ee426aa3cb844324df4ccbe932da6..38603858011c3e04f0c886b49ab2d6fe41755282 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info +++ b/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info @@ -15,8 +15,8 @@ stylesheets[all][] = css/panopoly-modal.css features[features_api][] = api:2 files[] = plugins/views/panopoly_magic_plugin_display_panel_pane.inc -; Information added by Drupal.org packaging script on 2018-12-12 -version = "7.x-1.58" +; Information added by Drupal.org packaging script on 2019-01-17 +version = "7.x-1.59" core = "7.x" project = "panopoly_magic" -datestamp = "1544590743" +datestamp = "1547743904" diff --git a/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt index 0040e704784b410e76aa1d49c8006a8e24d7cd22..c64802f782677ea64319ac71e4c8db6f6bdf1590 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt +++ b/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt @@ -1,3 +1,7 @@ +7.x-1.59, 2019-01-17 +------------------- +- No changes since last release. + 7.x-1.58, 2018-12-11 ------------------- - No changes since last release. diff --git a/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info b/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info index 8e6f1755d47476b477ac85fce2a820e44a5e76aa..9dccd0e60b5d6056ccf26717cbeae764d008a090 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info +++ b/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info @@ -81,8 +81,8 @@ features_exclude[variable][pathauto_node_panopoly_landing_page_pattern] = pathau features_exclude[variable][pathauto_node_panopoly_page_pattern] = pathauto_node_panopoly_page_pattern features_exclude[variable][pathauto_taxonomy_term_panopoly_categories_pattern] = pathauto_taxonomy_term_panopoly_categories_pattern -; Information added by Drupal.org packaging script on 2018-12-12 -version = "7.x-1.58" +; Information added by Drupal.org packaging script on 2019-01-17 +version = "7.x-1.59" core = "7.x" project = "panopoly_pages" -datestamp = "1544590755" +datestamp = "1547743926" diff --git a/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt index 1b2e62716bc467500f044c224e0c057a343ae910..d381b76dfa77fa375af8009feb75f0b4cf718a7c 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt +++ b/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt @@ -1,3 +1,7 @@ +7.x-1.59, 2019-01-17 +------------------- +- No changes since last release. + 7.x-1.58, 2018-12-11 ------------------- - Update search_api to 1.25 and search_api_db to 1.7. diff --git a/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info b/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info index 586a2159fbbc59a8002d94e41e5a9069f60caf97..7b3b8d7bd3e8a49cec5d29b8e65fdc4139417066 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info +++ b/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info @@ -54,8 +54,8 @@ features[variable][] = search_cron_limit features[views_view][] = panopoly_database_search features[views_view][] = panopoly_search -; Information added by Drupal.org packaging script on 2018-12-12 -version = "7.x-1.58" +; Information added by Drupal.org packaging script on 2019-01-17 +version = "7.x-1.59" core = "7.x" project = "panopoly_search" -datestamp = "1544590768" +datestamp = "1547743955" diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt index d05a5ed90af3bb2d181eb65d2f174b38bd48bb74..262b284246fc5dcf8540148dcdc88dda2060a49c 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt +++ b/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt @@ -1,3 +1,7 @@ +7.x-1.59, 2019-01-17 +------------------- +- No changes since last release. + 7.x-1.58, 2018-12-11 ------------------- - No changes since last release. diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info index ac0cc9191083dcc9a5bcfcf287ad0cb8640b75ad..6a987eeefb67ad4ea74119324e9bc361a31a67af 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info +++ b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info @@ -99,8 +99,8 @@ features_exclude[dependencies][panopoly_pages] = panopoly_pages features_exclude[dependencies][panelizer] = panelizer hidden = 1 -; Information added by Drupal.org packaging script on 2018-12-12 -version = "7.x-1.58" +; Information added by Drupal.org packaging script on 2019-01-17 +version = "7.x-1.59" core = "7.x" project = "panopoly_test" -datestamp = "1544590782" +datestamp = "1547743980" diff --git a/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt index a1048d20c2ddc5a2134d85b61ed24184c87cc02a..124a1aaef2f586cadb363a33267c54e2693751f3 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt +++ b/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt @@ -1,3 +1,7 @@ +7.x-1.59, 2019-01-17 +------------------- +- No changes since last release. + 7.x-1.58, 2018-12-11 ------------------- - No changes since last release. diff --git a/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info b/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info index 879dcac21ca0d2c531f479eef134de74405bfef7..ff7871a91e682cfb01e1146ab71c6ad507fefad0 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info +++ b/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info @@ -11,8 +11,8 @@ stylesheets[all][] = css/panopoly-accordian.css stylesheets[all][] = css/panopoly-layouts.css features[features_api][] = api:2 -; Information added by Drupal.org packaging script on 2018-12-12 -version = "7.x-1.58" +; Information added by Drupal.org packaging script on 2019-01-17 +version = "7.x-1.59" core = "7.x" project = "panopoly_theme" -datestamp = "1544590793" +datestamp = "1547744004" diff --git a/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt index 621a7f196417dfd84e48e6eb10cf79bf039ae410..f2bd5d6b52c32471da67c97ba764cbad541cb159 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt +++ b/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt @@ -1,3 +1,7 @@ +7.x-1.59, 2019-01-17 +------------------- +- No changes since last release. + 7.x-1.58, 2018-12-11 ------------------- - File entity overwriting slide title on spotlight widgets. diff --git a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info index 338c8eaf9b5d1e021de05101f85873a792f35709..fabc9d5ec44b3aa256bf38247d4788835aa92321 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info +++ b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info @@ -125,8 +125,8 @@ features[linkit_profiles][] = content_fields features[views_view][] = panopoly_widgets_general_content features_exclude[dependencies][linkit] = linkit -; Information added by Drupal.org packaging script on 2018-12-12 -version = "7.x-1.58" +; Information added by Drupal.org packaging script on 2019-01-17 +version = "7.x-1.59" core = "7.x" project = "panopoly_widgets" -datestamp = "1544590822" +datestamp = "1547744042" diff --git a/profiles/wcm_base/patches/pantheon-yml.patch b/profiles/wcm_base/patches/pantheon-yml.patch index dfa5c4ffa6f5a6a2b06245e1bb3c846379cf5e4c..f65fc452e862d15a60fa5e99a5c68c029cafedd9 100644 --- a/profiles/wcm_base/patches/pantheon-yml.patch +++ b/profiles/wcm_base/patches/pantheon-yml.patch @@ -6,7 +6,7 @@ index 0000000..25f0f6d @@ -0,0 +1,12 @@ +api_version: 1 + -+php_version: 5.6 ++php_version: 7.1 + +drush_version: 7 + diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make index f0d123130e4a14cd437a63ceb265634829119fb3..13343b3b534e0472085751e46585eb11d6b2b497 100644 --- a/profiles/wcm_base/wcm_base.make +++ b/profiles/wcm_base/wcm_base.make @@ -485,31 +485,31 @@ libraries[ocio_modernizr][download][branch] = 7.x-1.x ; The Panopoly Foundation -projects[panopoly_core][version] = 1.58 +projects[panopoly_core][version] = 1.59 projects[panopoly_core][subdir] = panopoly -projects[panopoly_theme][version] = 1.58 +projects[panopoly_theme][version] = 1.59 projects[panopoly_theme][subdir] = panopoly -projects[panopoly_magic][version] = 1.58 +projects[panopoly_magic][version] = 1.59 projects[panopoly_magic][subdir] = panopoly -projects[panopoly_widgets][version] = 1.58 +projects[panopoly_widgets][version] = 1.59 projects[panopoly_widgets][subdir] = panopoly -projects[panopoly_admin][version] = 1.58 +projects[panopoly_admin][version] = 1.59 projects[panopoly_admin][subdir] = panopoly ; The Panopoly Toolset -projects[panopoly_pages][version] = 1.58 +projects[panopoly_pages][version] = 1.59 projects[panopoly_pages][subdir] = panopoly -projects[panopoly_search][version] = 1.58 +projects[panopoly_search][version] = 1.59 projects[panopoly_search][subdir] = panopoly ; For running the automated tests. -projects[panopoly_test][version] = 1.58 +projects[panopoly_test][version] = 1.59 projects[panopoly_test][subdir] = panopoly