Index: preprocess/preprocess-node.inc
===================================================================
--- preprocess/preprocess-node.inc	(revision 4773)
+++ preprocess/preprocess-node.inc	(working copy)
@@ -1,5 +1,5 @@
 <?php
-// $Id$
+// $Id: $
 /**
  * @file
  * Passes vars to node.tpl.php.
@@ -17,7 +17,7 @@
 $node = $vars['node'];
 
 // Prepare the vars that will store the attributes while being processed
-$vars['node_attributes'] = $node->attributes ? $node->attributes : array();
+$vars['node_attributes'] = !empty($node->attributes) ? $node->attributes : array();
 
 // Add an id for specific block styling.
 $vars['node_attributes']['id'] = 'node-'. $node->nid;
@@ -39,7 +39,9 @@
 // Add a class that indicates if there is author photo or not
 $vars['node_attributes']['class'][] = ($vars['picture'] !== '') ? 'with-photo' : 'without-photo';
 // Add support for the Skinr module.
-$vars['node_attributes']['class'][] = $vars['skinr'];
+if (isset($vars['skinr'])) {
+  $vars['node_attributes']['class'][] = $vars['skinr'];
+}
 
 // Remove classes on links, the wrapper classes are enough.
 $vars['links'] = !empty($node->links) ? theme('links', $node->links, NULL) : '';
@@ -91,4 +93,4 @@
 elseif ($node->type == 'forum' && !$vars['page']) {
   $vars['template_files'][0] = 'node';
   return;
-}
\ No newline at end of file
+}
Index: preprocess/preprocess-views-view.inc
===================================================================
--- preprocess/preprocess-views-view.inc	(revision 4773)
+++ preprocess/preprocess-views-view.inc	(working copy)
@@ -1,5 +1,5 @@
 <?php
-// $Id$
+// $Id: $
 
 /**
  * @file
@@ -20,10 +20,14 @@
 $vars['views_attributes']['class'][] = 'view-dom-id-'. $vars['dom_id'];
 
 // Add a class for the display plugin being used.
-$vars['views_attributes']['class'][] =  $vars['view']->display['$display_id']['display_plugin'];
+if (isset($vars['view']->display['$display_id']['display_plugin'])) {
+  $vars['views_attributes']['class'][] =  $vars['view']->display['$display_id']['display_plugin'];
+}
 
 // Add support for the Skinr module
-$vars['views_attributes']['class'][] = $vars['skinr'];
+if (isset($vars['skinr'])) {
+  $vars['views_attributes']['class'][] = $vars['skinr'];
+}
 
 // Crunch all attributes into a single string to be added to the block container.
-$vars['views_attributes'] = theme('render_attributes', $vars['views_attributes']);
\ No newline at end of file
+$vars['views_attributes'] = theme('render_attributes', $vars['views_attributes']);
Index: preprocess/preprocess-block.inc
===================================================================
--- preprocess/preprocess-block.inc	(revision 4773)
+++ preprocess/preprocess-block.inc	(working copy)
@@ -1,5 +1,5 @@
 <?php
-// $Id$
+// $Id: $
 
 /**
  * @file
@@ -17,7 +17,7 @@
 $block = $vars['block'];
 
 // Prepare the variables that will store the attributes while being processed
-$vars['block_attributes'] = $block->attributes ? $block->attributes : array();
+$vars['block_attributes'] = !empty($block->attributes) ? $block->attributes : array();
 
 // Add an id for specific block styling.
 $vars['block_attributes']['id'] = 'block-'. $block->module .'-'. $block->delta;
@@ -50,7 +50,9 @@
 }
 
 // Add support for the Skinr module.
-$vars['block_attributes']['class'][] = $vars['skinr'];
+if (isset($vars['skinr'])) {
+  $vars['block_attributes']['class'][] = $vars['skinr'];
+}
 
 // Crunch all attributes into a single string to be added to the block container.
 $vars['block_attributes'] = theme('render_attributes', $vars['block_attributes']);
Index: preprocess/preprocess-comment-wrapper.inc
===================================================================
--- preprocess/preprocess-comment-wrapper.inc	(revision 4773)
+++ preprocess/preprocess-comment-wrapper.inc	(working copy)
@@ -1,5 +1,5 @@
 <?php
-// $Id$
+// $Id: $
 
 /**
  * @file
@@ -23,7 +23,9 @@
 // Add a class indicating no comments have been posted.
 $vars['comment_wrapper_attributes']['class'][] = empty($vars['content']) ? 'no-comments' : '';
 // Add support for the Skinr module.
-$vars['comment_wrapper_attributes']['class'][] = $vars['skinr'];
+if (isset($vars['skinr'])) {
+  $vars['comment_wrapper_attributes']['class'][] = $vars['skinr'];
+}
 // Add a clearfix class.
 $vars['comment_wrapper_attributes']['class'][] = 'clearfix';
 
@@ -42,4 +44,4 @@
 }
 
 // Render the comment wrapper attributes.
-$vars['comment_wrapper_attributes'] = theme('render_attributes', $vars['comment_wrapper_attributes']);
\ No newline at end of file
+$vars['comment_wrapper_attributes'] = theme('render_attributes', $vars['comment_wrapper_attributes']);
Index: preprocess/preprocess-comment.inc
===================================================================
--- preprocess/preprocess-comment.inc	(revision 4773)
+++ preprocess/preprocess-comment.inc	(working copy)
@@ -1,5 +1,5 @@
 <?php
-// $Id$
+// $Id: $
 
 /**
  * @file
@@ -16,7 +16,7 @@
 $node = node_load($comment->nid);
 
 // Prepare the variables that will store the attributes while being processed
-$vars['comment_attributes'] = $comment->attributes ? $comment->attributes : array();
+$vars['comment_attributes'] = !empty($comment->attributes) ? $comment->attributes : array();
 
 $advanced_forum = function_exists('advanced_forum_theme');
 if ($node->type == 'forum' && !$advanced_forum) {
@@ -77,7 +77,9 @@
 // Add the clearfix class
 $vars['comment_attributes']['class'][] = 'clearfix';
 // Add support for the Skinr module.
-$vars['comment_attributes']['class'][] = $vars['skinr'];
+if (isset($vars['skinr'])) {
+  $vars['comment_attributes']['class'][] = $vars['skinr'];
+}
 
 // Crunch all attributes into a single string to be added to the block container.
 $vars['comment_attributes'] = theme('render_attributes', $vars['comment_attributes']);
Index: functions/theme-custom.inc
===================================================================
--- functions/theme-custom.inc	(revision 4773)
+++ functions/theme-custom.inc	(working copy)
@@ -1,5 +1,5 @@
 <?php
-// $Id$
+// $Id: $
 
 /**
  * @file
Index: functions/theme-overrides.inc
===================================================================
--- functions/theme-overrides.inc	(revision 4773)
+++ functions/theme-overrides.inc	(working copy)
@@ -1,5 +1,5 @@
 <?php
-// $Id$
+// $Id: $
 
 /**
  * @file
@@ -383,14 +383,10 @@
   $t = get_t();
 
   // Create a class that indicates what type of form item is inside the wrapper.
-  if (!empty($element['#type'])) {
-    $class_type = ' form-item-'. str_replace('_', '-', $element['#type']);
-  }
+  $class_type = empty($element['#type']) ? '' : ' form-item-'. str_replace('_', '-', $element['#type']);
 
   // Create a class that indicates if the element is required
-  if ($element['#required'] == TRUE) {
-    $class_required = ' form-item-required';
-  }
+  $class_required = $element['#required'] == TRUE ? ' form-item-required' : '';
 
   $output = '<div class="form-item'. $class_type . $class_required .'"';
 
@@ -428,4 +424,4 @@
  */
 function sky_more_link($url, $title) {
   return '<div class="more-link"> <span class="icon">&nbsp;</span> '. t('<a href="@link" title="@title">more</a>', array('@link' => check_url($url), '@title' => $title)) .'</div>';
-}
\ No newline at end of file
+}