From a1ebdfd9fdafcf7c8da54da91f3292a057ec351a Mon Sep 17 00:00:00 2001 From: William Hearn Date: Sun, 28 May 2017 14:16:21 -0400 Subject: [PATCH] Issue #2881978: Temporarily disable bootstrap icon logic while working on it --- src/Bootstrap.php | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/src/Bootstrap.php b/src/Bootstrap.php index 63f0d66..cb869b3 100644 --- a/src/Bootstrap.php +++ b/src/Bootstrap.php @@ -592,25 +592,15 @@ class Bootstrap { // @todo Supply a specific version to _bootstrap_glyphicons() when Icon API // supports versioning. if (self::getTheme()->hasGlyphicons() && in_array($name, self::glyphicons())) { - // Attempt to use the Icon API module, if enabled and it generates output. - if (\Drupal::moduleHandler()->moduleExists('icon')) { - $icon = [ - '#type' => 'icon', - '#bundle' => 'bootstrap', - '#icon' => 'glyphicon-' . $name, - ]; - } - else { - $icon = [ - '#type' => 'html_tag', - '#tag' => 'span', - '#value' => '', - '#attributes' => [ - 'class' => ['icon', 'glyphicon', 'glyphicon-' . $name], - 'aria-hidden' => 'true', - ], - ]; - } + $icon = [ + '#type' => 'html_tag', + '#tag' => 'span', + '#value' => '', + '#attributes' => [ + 'class' => ['icon', 'glyphicon', 'glyphicon-' . $name], + 'aria-hidden' => 'true', + ], + ]; } return $icon ?: $default; -- 2.5.4 (Apple Git-61)