Issue #8273 by cableman: Updated coding style to match drupal 7