? themekey-958184-2.patch
Index: themekey_help.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/themekey/themekey_help.inc,v
retrieving revision 1.4.2.5
diff -u -p -r1.4.2.5 themekey_help.inc
--- themekey_help.inc	17 Oct 2010 13:53:08 -0000	1.4.2.5
+++ themekey_help.inc	3 Nov 2010 10:01:17 -0000
@@ -40,8 +40,7 @@ function themekey_help_tutorials_form($f
 
   $form['themekey_help_tutorials']['Rule Chaining: Using a special theme for content creation depending on user roles']['item'] = array(
     '#type' => 'item',
-    '#markup' => '<p>' . t('Note: This tutorial uses some ThemeKey properties from an additional module called !themekey_properties_link.', array('!themekey_properties_link' => l(t('!path', array('!path' => 'ThemeKey Properties')), 'http://drupal.org/project/themekey_properties'))) . '</p>' .
-'<p>' . t("In this tutorial you'll learn how to define ThemeKey rules and how to cascade them to achieve sophisticated rule chains.") . '</p>' .
+    '#markup' => '<p>' . t("In this tutorial you'll learn how to define ThemeKey rules and how to cascade them to achieve sophisticated rule chains.") . '</p>' .
 '<p>' . t("The use case is to use a different theme during conent creation for premium users, p.e. you don't want to show advertisements or you want to show some advanced help blocks ...") . '</p>' .
 '<p>' . t('Therefor you created two user roles called "premium user" and "standard user". Using ThemeKey it\'s easy to create a rule that switches the theme in general if a user\'s role is "premium user":') . '<br />' .
 '<img src="' . $img_path . 'premium_user.png" alt="' . t('ThemeKey rule that switches the theme if the user\'s role is "premium user"') . '" /></p>' .
Index: modules/themekey_browser_detection.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/themekey/modules/Attic/themekey_browser_detection.php,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 themekey_browser_detection.php
--- modules/themekey_browser_detection.php	16 Oct 2010 15:00:38 -0000	1.1.2.1
+++ modules/themekey_browser_detection.php	3 Nov 2010 10:01:17 -0000
@@ -165,6 +165,9 @@ class ThemekeyBrowserDetection {
     elseif (strpos($useragent, 'windows nt 6.0') !== FALSE) {
       return 'Windows Vista';
     }
+    elseif (strpos($useragent, 'windows nt 7.0') !== FALSE) {
+      return 'Windows 7';
+    }
     elseif (strpos($useragent, 'windows 98') !== FALSE) {
       return 'Windows 98';
     }