1 files changed, 6 insertions, 4 deletions
diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine
index 11561716f..310d4e68d 100644
--- a/themes/engines/phptemplate/phptemplate.engine
+++ b/themes/engines/phptemplate/phptemplate.engine
@@ -93,6 +93,7 @@ function _phptemplate_default_variables($hook, $variables) {
 function phptemplate_features() {
   return array(
        'logo',
+       'toggle_favicon',
        'toggle_name',
        'toggle_search',
        'toggle_slogan',
@@ -110,15 +111,16 @@ function phptemplate_features() {
 function phptemplate_page($content) {
   /* Set title and breadcrumb to declared values */
 
-  if (file_exists(path_to_theme() . '/favicon.ico')) {
-    drupal_set_html_head("<link rel=\"shortcut icon\" href=\"" . path_to_theme() . "/favicon.ico\" />\n");
-  }
-
   if ($_GET['q'] == variable_get('site_frontpage', 'node')) {
     $mission = theme_get_setting('mission');
     $frontpage = true;
   }
 
+  /* Add favicon */
+  if (theme_get_setting('toggle_favicon')) {
+    drupal_set_html_head('<link rel="shortcut icon" href="'. check_url(theme_get_setting('favicon')) .'" type="image/x-icon" />');
+  }
+
   /**
   * Populate sidebars.
   */