The $site variable is made redundant by $site_name, and is not used.

CommentFileSizeAuthor
phptemplate_redundant_var_patch.txt815 bytesrobertDouglass
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

robertDouglass’s picture

Assigned: Unassigned » robertDouglass
Steven’s picture

Bluemarine declares $theme as global, but as far as I can tell it doesn't use it anywhere. I think we can safely remove it?

robertDouglass’s picture

agree. It can be removed.

Dries’s picture

I think it is being used in bluemarine/page.tpl.php:
l(t('edit secondary links'),'admin/themes/settings/' .$theme)

Please double check.

Steven’s picture

Status: Needs review » Fixed

This is not present in the core bluemarine, I removed it.

Steven’s picture

Status: Fixed » Needs review

Sorry the two issues ($site and $theme) got mixed up. I probably just pasted in the wrong tab :P.

$site is being used by several contrib modules... $site_name only applies to the main name when displayed as a logo. Contrib usages show "Welcome to $site". It's probably a good idea to keep it, no?

robertDouglass’s picture

I still think it is redundant and that the contrib usages should be updated. In fact, the example that you quote is really a bug because it overrides the toggle presented by the theme. $site_name is exactly the same text, but only gets shown if the administrator has toggled it on. It seems to me like PHPTemplate engine should only offer $site_name, and if the theme really *wants* to override the toggle, they can still call variable_get. I think the theme creator in the contrib example was confused by the redundancy.

Steven’s picture

Status: Needs review » Fixed

Well, it's not really a bug... it's merely a variable that is available for use. $site_name incorporates the wish to display the site_name as a title in the header. $site is used in alt attributes and whatnot.

Still I got rid of it. Please add a note to the theme upgrading guide about this though.

Anonymous’s picture

Anonymous’s picture

Anonymous’s picture

Anonymous’s picture

Anonymous’s picture

Status: Fixed » Closed (fixed)