User: jwolf Branch: DRUPAL-6--2 Date: Sun, 07 Jun 2009 11:47:51 +0000 Modified files: /themes/acquia_marina template.php theme-settings.php Log message: modified theme so that it calls the right template.php file and avoids function name collisions with admin themes - phptemplate has been replaced with theme_name Links: http://cvs.drupal.org/diff.php?path=contributions/themes/acquia_marina/templ... http://cvs.drupal.org/diff.php?path=contributions/themes/acquia_marina/theme...