Index: template.php =================================================================== --- template.php (revision 117) +++ template.php (working copy) @@ -157,14 +157,14 @@ /** * Modify theme variables */ -function phptemplate_preprocess(&$vars) { +function acquia_marina_preprocess(&$vars) { global $user; // Get the current user $vars['is_admin'] = in_array('admin', $user->roles); // Check for Admin, logged in $vars['logged_in'] = ($user->uid > 0) ? TRUE : FALSE; } -function phptemplate_preprocess_page(&$vars) { +function acquia_marina_preprocess_page(&$vars) { // Remove sidebars if disabled if (!$vars['show_blocks']) { $vars['sidebar_first'] = ''; @@ -304,14 +304,14 @@ } -function phptemplate_preprocess_block(&$vars) { +function acquia_marina_preprocess_block(&$vars) { // Add regions with rounded blocks (e.g., sidebar_first, sidebar_last) to $rounded_regions array $rounded_regions = array('sidebar_first','sidebar_last','postscript_first','postscript_middle','postscript_last'); $vars['rounded_block'] = (in_array($vars['block']->region, $rounded_regions)) ? TRUE : FALSE; } -function phptemplate_preprocess_node(&$vars) { +function acquia_marina_preprocess_node(&$vars) { // Build array of handy node classes $node_classes = array(); $node_classes[] = $vars['zebra']; // Node is odd or even @@ -478,7 +478,7 @@ } -function phptemplate_preprocess_comment(&$vars) { +function acquia_marina_preprocess_comment(&$vars) { global $user; // Build array of handy comment classes $comment_classes = array(); @@ -505,7 +505,7 @@ * Set defaults for comments display * (Requires comment-wrapper.tpl.php file in theme directory) */ -function phptemplate_preprocess_comment_wrapper(&$vars) { +function acquia_marina_preprocess_comment_wrapper(&$vars) { $vars['display_mode'] = COMMENT_MODE_FLAT_EXPANDED; $vars['display_order'] = COMMENT_ORDER_OLDEST_FIRST; $vars['comment_controls_state'] = COMMENT_CONTROLS_HIDDEN; @@ -517,7 +517,7 @@ * (e.g., node, teaser, list, table, etc.) * (Requires views-view.tpl.php file in theme directory) */ -function phptemplate_preprocess_views_view(&$vars) { +function acquia_marina_preprocess_views_view(&$vars) { $vars['css_name'] = $vars['css_name'] .' view-style-'. views_css_safe(strtolower($vars['view']->type)); } @@ -525,7 +525,7 @@ /** * Modify search results based on theme settings */ -function phptemplate_preprocess_search_result(&$variables) { +function acquia_marina_preprocess_search_result(&$variables) { static $search_zebra = 'even'; $search_zebra = ($search_zebra == 'even') ? 'odd' : 'even'; $variables['search_zebra'] = $search_zebra; @@ -572,7 +572,7 @@ /** * Override username theming to display/hide 'not verified' text */ -function phptemplate_username($object) { +function acquia_marina_username($object) { if ($object->uid && $object->name) { // Shorten the name when it is too long or it will break many tables. if (drupal_strlen($object->name) > 20) { @@ -614,7 +614,7 @@ /** * Set default form file input size */ -function phptemplate_file($element) { +function acquia_marina_file($element) { $element['#size'] = 40; return theme_file($element); }