Skip to content
Snippets Groups Projects
Commit f21fe225 authored by catch's avatar catch
Browse files

Issue #3436478 by longwave: Use regex instead of DOM parsing in BigPipe::getPlaceholderOrder()

parent 8f28c48d
No related branches found
No related tags found
29 merge requests!11131[10.4.x-only-DO-NOT-MERGE]: Issue ##2842525 Ajax attached to Views exposed filter form does not trigger callbacks,!9470[10.3.x-only-DO-NOT-MERGE]: #3331771 Fix file_get_contents(): Passing null to parameter,!8540Issue #3457061: Bootstrap Modal dialog Not closing after 10.3.0 Update,!8528Issue #3456871 by Tim Bozeman: Support NULL services,!8373Issue #3427374 by danflanagan8, Vighneshh: taxonomy_tid ViewsArgumentDefault...,!7526Expose roles in response,!7352Draft: Resolve #3203489 "Set filename as",!3878Removed unused condition head title for views,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3133core/modules/system/css/components/hidden.module.css,!2964Issue #2865710 : Dependencies from only one instance of a widget are used in display modes,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2794Issue #3100732: Allow specifying `meta` data on JSON:API objects,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2062Issue #3246454: Add weekly granularity to views date sort,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!877Issue #2708101: Default value for link text is not saved,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493
Pipeline #132080 canceled
Pipeline: drupal

#132083

    ......@@ -700,7 +700,9 @@ protected function renderPlaceholder($placeholder, array $placeholder_render_arr
    /**
    * Gets the BigPipe placeholder order.
    *
    * Determines the order in which BigPipe placeholders are executed.
    * Determines the order in which BigPipe placeholders are executed. It is
    * safe to use a regular expression here as the HTML is statically created in
    * \Drupal\big_pipe\Render\Placeholder\BigPipeStrategy::createBigPipeJsPlaceholder().
    *
    * @param string $html
    * HTML markup.
    ......@@ -718,13 +720,10 @@ protected function renderPlaceholder($placeholder, array $placeholder_render_arr
    * first occurrence.
    */
    protected function getPlaceholderOrder($html, $placeholders) {
    $placeholder_ids = [];
    $dom = Html::load($html);
    $xpath = new \DOMXPath($dom);
    foreach ($xpath->query('//span[@data-big-pipe-placeholder-id]') as $node) {
    $placeholder_ids[] = Html::escape($node->getAttribute('data-big-pipe-placeholder-id'));
    if (preg_match_all('/<span data-big-pipe-placeholder-id="([^"]*)">/', $html, $matches)) {
    return array_unique($matches[1]);
    }
    return array_unique($placeholder_ids);
    return [];
    }
    /**
    ......
    • catch @catch

      mentioned in commit ae8bbc33

      ·

      mentioned in commit ae8bbc33

      Toggle commit list
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment