Icon API support does not work if admin theme is not Bootstrap and fonts not downloaded [#2120479]

If the admin theme isn't set to Bootstrap and the fonts haven't been downloaded from Bootstrap and added into the theme directory, the glyphicons are not made available through the Icon API.

The issue appears to be with using global $theme instead of specifying bootstrap directly. Patch attached.

Comment	File	Size	Author
#2	bootstrap-icons-admin-theme-2120479-2.patch	822 bytes	geodaniel
#2
	bootstrap-icons-admin-theme-issue.patch	764 bytes	geodaniel

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

Comment #1

markhalliwell

English

CreditAttribution: markhalliwell commented 11 November 2013 at 23:01

Issue summary:	View changes
Status:	Needs review	» Needs work

Instead of using global $theme, we should instead probably use $theme = variable_get('theme_default', $GLOBALS['theme']);, the rest of the if statement is fine though. We cannot limit this to the base theme, it has to be per theme basis.

Comment #2

geodaniel CreditAttribution: geodaniel commented 12 November 2013 at 10:32

Status:

Needs work

» Needs review

File	Size
bootstrap-icons-admin-theme-2120479-2.patch	822 bytes

That makes sense. Presumably the bootstrap files would still be in the bootstrap directory itself, it's just the CDN setting that needs to be controllable by the sub theme.

Updated patch attached.

Comment #3

markhalliwell

English

CreditAttribution: markhalliwell commented 12 November 2013 at 10:34

Status:

Needs review

» Needs work

+++ b/theme/icons.inc
@@ -21,10 +21,10 @@ function bootstrap_icon_providers() {
-  if ($cdn || (!$cdn && file_exists(drupal_get_path('theme', $theme) . '/bootstrap/fonts/glyphicons-halflings-regular.ttf'))) {
+  if ($cdn || (!$cdn && file_exists(drupal_get_path('theme', 'bootstrap') . '/bootstrap/fonts/glyphicons-halflings-regular.ttf'))) {

This still shouldn't change.