BOINC / boinc

drupal/sites/default/boinc/modules/boincimport/boincimport.pages.inc

Spacing +66 added lines, -66 removed lines

@@ -5,7 +5,7 @@ 
  * Callback admin/boinc/import/settings
  */
 function boincimport_admin_settings() {
-  global $conf ;
+  global $conf;
   global $db_url;
   global $base_url;
   $stage = variable_get('boincimport_config_stage', 0); 
@@ -27,17 +27,17 @@ 
     
   $output = '';
   if (!variable_get('boincimport_tested', 0)) {
-    $form['test']['#collapsed']= FALSE;
+    $form['test']['#collapsed'] = FALSE;
     $output = '<span class="marker">';
     $ready_for_migration = 0;
   }
-  $output .= '<p>' . t('The migration will modify and even destroy some data. You
+  $output .= '<p>'.t('The migration will modify and even destroy some data. You
     must test this module on a copy of your data first, several times if necessary.
     Only use this module on your live data when you are familiar with the procedure
-    and you\'re confident everything will run smoothly.') . '</p><p>' . t('Also, you
+    and you\'re confident everything will run smoothly.').'</p><p>'.t('Also, you
     should make a full backup of your database just prior to performing the
     migration on the live data. It is better to turn off both the BOINC site and the
-    Drupal site during the migration.') . '</p>';
+    Drupal site during the migration.').'</p>';
   if (!variable_get('boincimport_tested', 0)) {
     $output .= '</span>';
   }
@@ -55,7 +55,7 @@ 
   
   // Where is BOINC data?
   $pre = variable_get('boincimport_table_prefix', '');
-  $tables = array($pre .'forum', $pre .'post', $pre .'thread', $pre .'user');
+  $tables = array($pre.'forum', $pre.'post', $pre.'thread', $pre.'user');
   $db = (is_array($db_url) AND isset($db_url['boinc'])) ? 'boinc' : 'default';
   $result = _boincimport_check_tables($tables, $db, 0);
   
@@ -79,8 +79,8 @@ 
     $default_db_url = is_array($db_url) ? end($db_url) : $db_url;
     $url = variable_get('boincimport_db_url', $default_db_url);
     if (!preg_match('{(mysql|pgsql):\/\/(.+):(.*?)@(.+)/(\w+)}i', $url)) {
-      $output = '<p class="marker">'. t('Set the address of the BOINC database
-        according to the following format:') . '<br /><pre>
+      $output = '<p class="marker">'.t('Set the address of the BOINC database
+        according to the following format:').'<br /><pre>
         mysql://boinc_username:boinc_password@localhost/boinc_database
         </pre></p>';
       $ready_for_migration = 0;
@@ -98,13 +98,13 @@ 
     );
   }
 
-  $output = '<p>' . t('Note that due to a limitation within Drupal core, we cannot
+  $output = '<p>'.t('Note that due to a limitation within Drupal core, we cannot
     import messages from one database type to another database type. E.g, we
     cannot import BOINC from a myqsl DB, to a postgresql DB. You need to import
     the data into the same type of database first (import all the BOINC data, as is,
-    from mysql to postgresql).') . '</p><p>' . t('If both BOINC and Drupal are on
+    from mysql to postgresql).').'</p><p>'.t('If both BOINC and Drupal are on
     postgresql, see !this_issue.', array('!this_issue' => l(t('this issue'),
-    'http://drupal.org/node/64877', array('attributes' => array('target' => '_blank'))))) . '</p>';
+    'http://drupal.org/node/64877', array('attributes' => array('target' => '_blank'))))).'</p>';
   $form['boinc_data']['note'] = array('#value' => $output);
   
   // BOINC table prefix
@@ -121,7 +121,7 @@ 
   $output = $result['html'];
   if ($result['result'] != 1) {
     $ready_for_migration = 0;
-    $form['boinc_data']['#collapsed']= FALSE;
+    $form['boinc_data']['#collapsed'] = FALSE;
     $output .= '<span class="marker">';
     $output .= t('Some tables couldn\'t be found. Are the database settings correct?
       Please correct the errors so that the BOINC tables can be accessed.');
@@ -169,15 +169,15 @@ 
     '#collapsible' => TRUE,
     '#collapsed' => TRUE
   );
-  $output = '<p>'. t('Select which !input_format should be used for the imported
+  $output = '<p>'.t('Select which !input_format should be used for the imported
     messages. It is highly-recommended that this value be left as it is, as the
     Full HTML and PHP code formats can be very dangerous!', 
-    array('!input_format' => l(t('input format'), 'admin/settings/filters'))) .'</p>';
+    array('!input_format' => l(t('input format'), 'admin/settings/filters'))).'</p>';
   $form['input']['intro'] = array('#value' => $output);
   
   $formats = db_query('SELECT format, name FROM {filter_formats}');
   while ($format = db_fetch_array($formats)) {
-    $input_formats[$format['format']]= $format['name'];
+    $input_formats[$format['format']] = $format['name'];
   }
   
   // By default, use the format named "Rich text"; fall back to Filtered HTML
@@ -194,10 +194,10 @@ 
   );
   if (!$input_format) {
     $ready_for_migration = 0;
-    $form['input']['#collapsed']= FALSE;
+    $form['input']['#collapsed'] = FALSE;
   }
-  $output = '<p><em>'. t('This setting will be applied to all posts and private
-    messages.') .'</em></p>';
+  $output = '<p><em>'.t('This setting will be applied to all posts and private
+    messages.').'</em></p>';
   $form['input']['result'] = array('#value' => $output);
   
   // BBcode settings
@@ -208,23 +208,23 @@ 
     '#collapsed' => TRUE,
   );
   
-  $output = '<p>' . t('BOINC posts are often formatted in BBcode. During the
-    import process, BBcode can be handled in two diffent ways') . ':</p>';
-  $output .= '<ul><li>' . t('Leave the BBcode as is and use the !bbcode_module
+  $output = '<p>'.t('BOINC posts are often formatted in BBcode. During the
+    import process, BBcode can be handled in two diffent ways').':</p>';
+  $output .= '<ul><li>'.t('Leave the BBcode as is and use the !bbcode_module
     after the migration to filter the imported posts. In this case, the module
     is not required during the migration, but will need to be installed and
     configured later.',
     array('!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode',
-    array('attributes' => array('target' => '_blank'))))) . '</li>';
-  $output .= '<li>' . t('Filter the BBcode now and replace it with plain HTML.
+    array('attributes' => array('target' => '_blank'))))).'</li>';
+  $output .= '<li>'.t('Filter the BBcode now and replace it with plain HTML.
     The BBcode module will be required during the migration process, but can
-    be disabled afterwards.') . '</li></ul>';
-  $output .= '<p>' . t('An appropriate input filter should be chosen, as well,
+    be disabled afterwards.').'</li></ul>';
+  $output .= '<p>'.t('An appropriate input filter should be chosen, as well,
     as it will affect how the post is displayed. For example, if BBcode is
     removed and replaced by HTML, some HTML tags will be stripped by the
     "Filtered HTML" input format unless they are first added to the list of
     allowed tags in that format. See the !input_formats page.',
-    array('!input_formats' => l(t('input formats'), 'admin/settings/filters'))) . '</p>';
+    array('!input_formats' => l(t('input formats'), 'admin/settings/filters'))).'</p>';
     
   $form['bbcode']['intro'] = array('#value' => $output);
   $form['bbcode']['boincimport_bbcode'] = array(
@@ -254,28 +254,28 @@ 
     $result = db_query($sql, $input_format);
     if (!db_result($result)) {
       $form['bbcode']['#collapsed'] = FALSE;
-      $output .= '<p class="marker">'. t('You need to !enable_bbcode_input and
+      $output .= '<p class="marker">'.t('You need to !enable_bbcode_input and
         then !configure_bbcode_options', array(
           '!enable_bbcode_input' =>  l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"),
-          '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))) .'</p>';
+          '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))).'</p>';
     }
-    $output .= '<p>'. t('For best results, !disable_all_options', 
-    array('!disable_all_options' => l(t('all four BBcode configure options should be disabled'), "admin/settings/filters/{$input_format}/configure"))) . '.</p>';
+    $output .= '<p>'.t('For best results, !disable_all_options', 
+    array('!disable_all_options' => l(t('all four BBcode configure options should be disabled'), "admin/settings/filters/{$input_format}/configure"))).'.</p>';
   } else {
     if ($bbcode_disabled) {
       $form['bbcode']['#collapsed'] = FALSE;
-      $output .= '<p>'. t('The !bbcode_module is recommended, but not required.
+      $output .= '<p>'.t('The !bbcode_module is recommended, but not required.
         You may !enable_bbcode after having installed it.', array(
           '!bbcode_module' => l(t('bbcode module'), 'http://drupal.org/project/bbcode', array('attributes' => array('target' => '_blank'))),
-          '!enable_bbcode' => l(t('enable the bbcode module'), 'admin/build/modules'))) .'</p>';
+          '!enable_bbcode' => l(t('enable the bbcode module'), 'admin/build/modules'))).'</p>';
     }
-    $output .= '<p>' . t('Don\'t forget to !enable_bbcode_input and then !configure_bbcode_options.', array(
+    $output .= '<p>'.t('Don\'t forget to !enable_bbcode_input and then !configure_bbcode_options.', array(
       '!enable_bbcode_input' =>  l(t('enable BBcode in the selected input format'), "admin/settings/filters/{$input_format}"),
-      '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))) . '</p>';
-    $output .= '<p>' . t('You may want to enable it for other input formats, too.') . '</p>';
+      '!configure_bbcode_options' => l(t('configure BBcode options'), "admin/settings/filters/{$input_format}/configure"))).'</p>';
+    $output .= '<p>'.t('You may want to enable it for other input formats, too.').'</p>';
   }
-  $output .= '<p><em>'. t('This setting will be applied to all posts, private
-    messages and the users\' signature.') .'</em></p>';
+  $output .= '<p><em>'.t('This setting will be applied to all posts, private
+    messages and the users\' signature.').'</em></p>';
     
   $form['bbcode']['result'] = array('#value' => $output);
   
@@ -287,7 +287,7 @@ 
     '#collapsed' => TRUE,
   );
   if (!variable_get('boincimport_base_url_boinc', 0)) {
-    $form['url_transforms']['#collapsed']= FALSE;
+    $form['url_transforms']['#collapsed'] = FALSE;
     $output = '<span class="marker">';
     $ready_for_migration = 0;
   }
@@ -320,11 +320,11 @@ 
   );
   variable_set('boincimport_ready', $ready_for_migration);
   if ($ready_for_migration) {
-    $output = '<p>'. t('Check the settings above one more time. If everything
-      is ok, !proceed.', array('!proceed' => l(t('you can now proceed with the migration'), 'admin/boinc/import/process'))) .'</p>';
+    $output = '<p>'.t('Check the settings above one more time. If everything
+      is ok, !proceed.', array('!proceed' => l(t('you can now proceed with the migration'), 'admin/boinc/import/process'))).'</p>';
   } else {
-    $output = '<p class="marker">'. t('You are not ready for the migration yet.
-      Please check the settings above.') .'</p>';
+    $output = '<p class="marker">'.t('You are not ready for the migration yet.
+      Please check the settings above.').'</p>';
   }
   
   $form['migration']['info'] = array('#value' => $output);
@@ -335,23 +335,23 @@ 
  * Callback admin/boinc/import/post_configuration
  */
 function boincimport_post_configuration() {
-  $output = '<p>'. t('This page will help to tie up any loose ends following
+  $output = '<p>'.t('This page will help to tie up any loose ends following
     the BOINC data import process. Before continuing, it may be best to have
-    already:') .'</p>';
+    already:').'</p>';
   $output .= '<ul>';
-  $output .= '<li>'. t('Imported users, teams, and forums using the BOINC
-    import module') .'</li>';
-  $output .= '<li>'. t('Imported any additional data using add on modules if
-    available.') .'</li>';
+  $output .= '<li>'.t('Imported users, teams, and forums using the BOINC
+    import module').'</li>';
+  $output .= '<li>'.t('Imported any additional data using add on modules if
+    available.').'</li>';
   $output .= '</ul>';
   //User Set up
-  $output .= '<h2>'. t('User settings') .'</h2>';  
-  $output .= '<p>'. t('Make sure your !user_settings are correct. Specifically,
+  $output .= '<h2>'.t('User settings').'</h2>';  
+  $output .= '<p>'.t('Make sure your !user_settings are correct. Specifically,
     you can enable or disable signatures there. ', array(
       '!user_settings' => l(t('user settings'), 'admin/user/settings')
-    )) .'</p>'; 
-  $output .= '<p>' . t('Note that avatar/picture support is not tied to user
-    settings Picture support at this time.') . '</p>';
+    )).'</p>'; 
+  $output .= '<p>'.t('Note that avatar/picture support is not tied to user
+    settings Picture support at this time.').'</p>';
   /*$output .= '<p>' . t('In order to activate avatar/picture support, you need to
     enable pictures on this page and also:') . '</p>';
   $output .= '<ul>';
@@ -366,15 +366,15 @@ 
   $output .= '</ul>'; */
   
   // Forum Set up
-  $output .= '<h2>'. t('Forum settings') .'</h2>';
-  $output .= '<p>'. t('Check any additional changes to make on the
+  $output .= '<h2>'.t('Forum settings').'</h2>';
+  $output .= '<p>'.t('Check any additional changes to make on the
     !forum_settings page.', array(
       '!forum_settings' =>  l(t('forum settings'), 'admin/content/forum/settings')
-    )) .'</p>';
-  $output .= '<p>'. t('It also may be a good idea to look at the !forum_list to
+    )).'</p>';
+  $output .= '<p>'.t('It also may be a good idea to look at the !forum_list to
     verify that all necessary containers and forums are in place.', array(
       '!forum_list' =>  l(t('forum list'), 'admin/content/forum')
-    )) .'</p>';
+    )).'</p>';
   /*$output .= '<p>'. t('If need be, set up the private forums as explained in the
     !documentation.', array(
       '!documentation' => l(t('documentation'), 'http://drupal.org/node/58969', array('attributes' => array('target' => '_blank')))
@@ -390,17 +390,17 @@ 
   // BBcode
   $bbcode = variable_get('boincimport_bbcode', 0);
   if ($bbcode) {
-    $output .= '<h2>'. t('Remove BBcode module') .'</h2>';
-    $output .= '<p>'. t('The BBcode has been cleaned from the posts. You shouldn\'t
-      need the bbcode module anymore. You can disable it.') .'</p>';
+    $output .= '<h2>'.t('Remove BBcode module').'</h2>';
+    $output .= '<p>'.t('The BBcode has been cleaned from the posts. You shouldn\'t
+      need the bbcode module anymore. You can disable it.').'</p>';
   } else {
-    $output .= '<h2>'. t('Configure BBcode module') .'</h2>';
-    $output .= '<p>'. t('Most likely, there are many BOINC forum postings
+    $output .= '<h2>'.t('Configure BBcode module').'</h2>';
+    $output .= '<p>'.t('Most likely, there are many BOINC forum postings
       formatted in BBcode. It would be a good idea to verify that BBcode is
       being formatted correctly in the imported posts. Have a look around
       !the_forum.', array(
         '!the_forum' =>  l(t('the forum'), 'community')
-      )) . '</p>';
+      )).'</p>';
   }
 
   return $output;
@@ -445,11 +445,11 @@ 
   $output .= '</ol>';
 
   // process will die() if the link to the BOINC database is wrong:
-  $output .= '<p>'. t('If the BOINC data is in another database, but you made a
+  $output .= '<p>'.t('If the BOINC data is in another database, but you made a
     mistake while setting up the data base url, you may be unable to access the
     setting page due to some limitations of the core of Drupal. !reset_db_url.', array(
       '!reset_db_url' => l(t('Click here to reset the database url'), 'admin/boinc/import/reset')
-    )) .'</p>';
+    )).'</p>';
 
   return $output;
 }

drupal/sites/default/boinc/modules/boinctranslate/boinctranslate.admin.inc

Spacing +1 added lines, -1 removed lines

@@ -301,7 +301,7 @@
           
           if ($response == '404 NOT FOUND') {
             form_set_error(
-              'boinc_translate_transifex_' . ($project == $boinc_name ? 'standard' : 'project') . '_resources',
+              'boinc_translate_transifex_'.($project == $boinc_name ? 'standard' : 'project').'_resources',
               t('Resource %name not found in %project.',
                 array(
                   '%name' => $resource,

drupal/sites/default/boinc/modules/boincuser/boincuser.views.inc

Spacing +1 added lines, -1 removed lines

@@ -274,7 +274,7 @@
 function boincuser_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'boincuser') . '/views',
+      'path' => drupal_get_path('module', 'boincuser').'/views',
     ),
     'handlers' => array(
       'views_handler_argument_boincuser_id' => array(

drupal/sites/default/boinc/themes/boinc/theme-settings.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 // $Id: theme-settings.php,v 1.7 2008/09/11 09:36:50 johnalbin Exp $
 
 // Include the definition of zen_settings() and zen_theme_get_default_settings().
-include_once './' . drupal_get_path('theme', 'zen') . '/theme-settings.php';
+include_once './'.drupal_get_path('theme', 'zen').'/theme-settings.php';
 
 
 /**

drupal/sites/all/themes/zen/zen-internals/template.conditional-styles.inc

Spacing +7 added lines, -7 removed lines

@@ -64,7 +64,7 @@ 
       // Render the stylesheets to link elements.
       $conditional_styles = $conditional_styles_rtl = '';
       if (!empty($stylesheets)) {
-        $query_string = '?'. substr(variable_get('css_js_query_string', '0'), 0, 1);
+        $query_string = '?'.substr(variable_get('css_js_query_string', '0'), 0, 1);
         $base_path = base_path();
         foreach ($stylesheets AS $condition => $css) {
           // Each condition requires its own set of links.
@@ -92,17 +92,17 @@ 
       // Save the stylesheets for later retrieval.
       if ($conditional_styles) {
         if (db_is_active()) {
-          variable_set('conditional_styles_' . $theme, $conditional_styles);
-          variable_set('conditional_styles_' . $theme . '_rtl', $conditional_styles_rtl);
+          variable_set('conditional_styles_'.$theme, $conditional_styles);
+          variable_set('conditional_styles_'.$theme.'_rtl', $conditional_styles_rtl);
         }
         else {
-          $GLOBALS['conf']['conditional_styles_' . $theme] = $conditional_styles;
-          $GLOBALS['conf']['conditional_styles_' . $theme . '_rtl'] = $conditional_styles_rtl;
+          $GLOBALS['conf']['conditional_styles_'.$theme] = $conditional_styles;
+          $GLOBALS['conf']['conditional_styles_'.$theme.'_rtl'] = $conditional_styles_rtl;
         }
       }
       elseif (db_is_active()) {
-        variable_del('conditional_styles_' . $theme);
-        variable_del('conditional_styles_' . $theme . '_rtl');
+        variable_del('conditional_styles_'.$theme);
+        variable_del('conditional_styles_'.$theme.'_rtl');
       }
     }
   }

drupal/sites/all/themes/zen/zen-internals/template.block-editing.inc

Spacing +7 added lines, -7 removed lines

@@ -17,7 +17,7 @@ 
 
   // Display 'edit block' for custom blocks.
   if ($block->module == 'block') {
-    $vars['edit_links_array']['block-edit'] = l('<span>' . t('edit block') . '</span>', 'admin/build/block/configure/' . $block->module . '/' . $block->delta,
+    $vars['edit_links_array']['block-edit'] = l('<span>'.t('edit block').'</span>', 'admin/build/block/configure/'.$block->module.'/'.$block->delta,
       array(
         'attributes' => array(
           'title' => t('edit the content of this block'),
@@ -30,7 +30,7 @@ 
   }
   // Display 'configure' for other blocks.
   else {
-    $vars['edit_links_array']['block-config'] = l('<span>' . t('configure') . '</span>', 'admin/build/block/configure/' . $block->module . '/' . $block->delta,
+    $vars['edit_links_array']['block-config'] = l('<span>'.t('configure').'</span>', 'admin/build/block/configure/'.$block->module.'/'.$block->delta,
       array(
         'attributes' => array(
           'title' => t('configure this block'),
@@ -45,14 +45,14 @@ 
   // Display 'edit view' for Views blocks.
   if ($block->module == 'views' && user_access('administer views')) {
     list($view_name, $view_block) = explode('-block', $block->delta);
-    $vars['edit_links_array']['block-edit-view'] = l('<span>' . t('edit view') . '</span>', 'admin/build/views/edit/' . $view_name,
+    $vars['edit_links_array']['block-edit-view'] = l('<span>'.t('edit view').'</span>', 'admin/build/views/edit/'.$view_name,
       array(
         'attributes' => array(
           'title' => t('edit the view that defines this block'),
           'class' => 'block-edit-view',
         ),
         'query' => drupal_get_destination(),
-        'fragment' => 'views-tab-block' . $view_block,
+        'fragment' => 'views-tab-block'.$view_block,
         'html' => TRUE,
       )
     );
@@ -60,7 +60,7 @@ 
   // Display 'edit menu' for Menu blocks.
   elseif (($block->module == 'menu' || ($block->module == 'user' && $block->delta == 1)) && user_access('administer menu')) {
     $menu_name = ($block->module == 'user') ? 'navigation' : $block->delta;
-    $vars['edit_links_array']['block-edit-menu'] = l('<span>' . t('edit menu') . '</span>', 'admin/build/menu-customize/' . $menu_name,
+    $vars['edit_links_array']['block-edit-menu'] = l('<span>'.t('edit menu').'</span>', 'admin/build/menu-customize/'.$menu_name,
       array(
         'attributes' => array(
           'title' => t('edit the menu that defines this block'),
@@ -73,8 +73,8 @@ 
   }
   // Display 'edit menu' for Menu block blocks.
   elseif ($block->module == 'menu_block' && user_access('administer menu')) {
-    list($menu_name, ) = split(':', variable_get("menu_block_{$block->delta}_parent", 'navigation:0'));
-    $vars['edit_links_array']['block-edit-menu'] = l('<span>' . t('edit menu') . '</span>', 'admin/build/menu-customize/' . $menu_name,
+    list($menu_name,) = split(':', variable_get("menu_block_{$block->delta}_parent", 'navigation:0'));
+    $vars['edit_links_array']['block-edit-menu'] = l('<span>'.t('edit menu').'</span>', 'admin/build/menu-customize/'.$menu_name,
       array(
         'attributes' => array(
           'title' => t('edit the menu that defines this block'),

drupal/sites/all/themes/zen/zen-internals/template.theme-registry.inc

Spacing +20 added lines, -20 removed lines

@@ -12,7 +12,7 @@ 
 function _zen_theme(&$existing, $type, $theme, $path) {
   // Compute the conditional stylesheets.
   if (!module_exists('conditional_styles')) {
-    include_once './' . _zen_path() . '/zen-internals/template.conditional-styles.inc';
+    include_once './'._zen_path().'/zen-internals/template.conditional-styles.inc';
     // _conditional_styles_theme() only needs to be run once.
     if ($theme == 'zen') {
       _conditional_styles_theme($existing, $type, $theme, $path);
@@ -26,9 +26,9 @@ 
   // If we are auto-rebuilding the theme registry, warn about the feature.
   // Always display the warning in the admin section, otherwise limit to three
   // warnings per hour.
-  if (function_exists('user_access') && user_access('administer site configuration') && theme_get_setting('zen_rebuild_registry') && $theme == $GLOBALS['theme'] && (arg(0) == 'admin' || flood_is_allowed($GLOBALS['theme'] . '_rebuild_registry_warning', 3))) {
-    flood_register_event($GLOBALS['theme'] . '_rebuild_registry_warning');
-    drupal_set_message(t('For easier theme development, the theme registry is being rebuilt on every page request. It is <em>extremely</em> important to <a href="!link">turn off this feature</a> on production websites.', array('!link' => url('admin/build/themes/settings/' . $GLOBALS['theme']))), 'warning', FALSE);
+  if (function_exists('user_access') && user_access('administer site configuration') && theme_get_setting('zen_rebuild_registry') && $theme == $GLOBALS['theme'] && (arg(0) == 'admin' || flood_is_allowed($GLOBALS['theme'].'_rebuild_registry_warning', 3))) {
+    flood_register_event($GLOBALS['theme'].'_rebuild_registry_warning');
+    drupal_set_message(t('For easier theme development, the theme registry is being rebuilt on every page request. It is <em>extremely</em> important to <a href="!link">turn off this feature</a> on production websites.', array('!link' => url('admin/build/themes/settings/'.$GLOBALS['theme']))), 'warning', FALSE);
   }
 
   // Keep track of all the base themes.
@@ -40,27 +40,27 @@ 
     foreach (array_keys($existing) as $hook) {
       // Normally, preprocess functions are added to the registry after
       // HOOK_theme() returns, but if we add them first, they won't be re-added.
-      if (function_exists($theme . '_preprocess')) {
-        $existing[$hook]['preprocess functions'][] = $theme . '_preprocess';
+      if (function_exists($theme.'_preprocess')) {
+        $existing[$hook]['preprocess functions'][] = $theme.'_preprocess';
       }
-      if (function_exists($theme . '_preprocess_' . $hook)) {
-        $existing[$hook]['preprocess functions'][] = $theme . '_preprocess_' . $hook;
+      if (function_exists($theme.'_preprocess_'.$hook)) {
+        $existing[$hook]['preprocess functions'][] = $theme.'_preprocess_'.$hook;
       }
       // Add base theme process functions.
       foreach ($base_themes as $base_theme) {
-        if (function_exists($base_theme . '_process')) {
-          $existing[$hook]['preprocess functions'][] = $base_theme . '_process';
+        if (function_exists($base_theme.'_process')) {
+          $existing[$hook]['preprocess functions'][] = $base_theme.'_process';
         }
-        if (function_exists($base_theme . '_process_' . $hook)) {
-          $existing[$hook]['preprocess functions'][] = $base_theme . '_process_' . $hook;
+        if (function_exists($base_theme.'_process_'.$hook)) {
+          $existing[$hook]['preprocess functions'][] = $base_theme.'_process_'.$hook;
         }
       }
       // Add the theme process functions.
-      if (function_exists($theme . '_process')) {
-        $existing[$hook]['preprocess functions'][] = $theme . '_process';
+      if (function_exists($theme.'_process')) {
+        $existing[$hook]['preprocess functions'][] = $theme.'_process';
       }
-      if (function_exists($theme . '_process_' . $hook)) {
-        $existing[$hook]['preprocess functions'][] = $theme . '_process_' . $hook;
+      if (function_exists($theme.'_process_'.$hook)) {
+        $existing[$hook]['preprocess functions'][] = $theme.'_process_'.$hook;
       }
     }
   }
@@ -78,7 +78,7 @@ 
       'region' => array(
         'arguments' => array('elements' => NULL),
         'pattern' => 'region_',
-        'path' => drupal_get_path('theme', 'zen') . '/templates',
+        'path' => drupal_get_path('theme', 'zen').'/templates',
         'template' => 'region',
         // drupal_find_theme_templates() requires this, so manually add it.
         'include files' => array(),
@@ -118,13 +118,13 @@ 
 
   if (!module_exists('domain_theme') && !empty($defaults)) {
     // Merge the defaults with the theme settings saved in the database.
-    $settings = array_merge($defaults, variable_get('theme_'. $theme .'_settings', array()));
+    $settings = array_merge($defaults, variable_get('theme_'.$theme.'_settings', array()));
     // Save the settings back to the database.
     if (db_is_active()) {
-      variable_set('theme_'. $theme .'_settings', $settings);
+      variable_set('theme_'.$theme.'_settings', $settings);
     }
     else {
-      $GLOBALS['conf']['theme_'. $theme .'_settings'] = $settings;
+      $GLOBALS['conf']['theme_'.$theme.'_settings'] = $settings;
     }
     // If the active theme has been loaded, force refresh of Drupal internals.
     if (!empty($GLOBALS['theme_key'])) {

drupal/sites/all/themes/zen/zen-internals/template.zen.inc

Spacing +6 added lines, -6 removed lines

@@ -14,25 +14,25 @@
  * If the user is silly and enables Zen as the theme, manually add some stylesheets.
  */
 function _zen_preprocess_page(&$vars, $hook) {
-  $directory = _zen_path() . '/zen-internals/css';
+  $directory = _zen_path().'/zen-internals/css';
 
   // Add default styles.
   if (theme_get_setting('zen_layout') == 'zen-columns-fixed') {
-    drupal_add_css($directory . '/zen-fixed.css', 'theme', 'all');
+    drupal_add_css($directory.'/zen-fixed.css', 'theme', 'all');
   }
   else {
-    drupal_add_css($directory . '/zen-liquid.css', 'theme', 'all');
+    drupal_add_css($directory.'/zen-liquid.css', 'theme', 'all');
   }
   // Add print styles.
-  drupal_add_css($directory . '/print.css', 'theme', 'print');
+  drupal_add_css($directory.'/print.css', 'theme', 'print');
 
   // Regenerate the stylesheets.
   $vars['css'] = drupal_add_css();
   $vars['styles'] = drupal_get_css();
 
   // Add IE styles.
-  $query_string = '?'. substr(variable_get('css_js_query_string', '0'), 0, 1);
-  $base_path = base_path() . $directory;
+  $query_string = '?'.substr(variable_get('css_js_query_string', '0'), 0, 1);
+  $base_path = base_path().$directory;
   $vars['styles'] .= <<< IE_STYLES
 <!--[if IE]><link type="text/css" rel="stylesheet" media="all" href="$base_path/ie.css$query_string" /><![endif]-->
 <!--[if lte IE 6]><link type="text/css" rel="stylesheet" media="all" href="$base_path/ie6.css$query_string" /><![endif]-->

drupal/sites/all/themes/zen/zen-internals/template.comment.inc

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
   $vars['created'] = $vars['date'];
 
   // If comment subjects are disabled, don't display them.
-  if (variable_get('comment_subject_field_' . $vars['node']->type, 1) == 0) {
+  if (variable_get('comment_subject_field_'.$vars['node']->type, 1) == 0) {
     $vars['title'] = '';
   }