From 013b73e6ec851cea0e72312acce3abeb0cabd472 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Thu, 8 Sep 2005 19:19:01 +0000 Subject: - Patch #30122 by m3verick: changed include_once()'s to include "./$file" for performance's sake. --- cron.php | 2 +- database/updates.inc | 2 +- includes/bootstrap.inc | 2 +- includes/database.inc | 4 ++-- includes/image.inc | 4 ++-- includes/theme.inc | 4 ++-- modules/locale.module | 12 ++++++------ modules/locale/locale.module | 12 ++++++------ modules/system.module | 4 ++-- modules/system/system.module | 4 ++-- modules/user.module | 2 +- modules/user/user.module | 2 +- themes/engines/phptemplate/phptemplate.engine | 4 ++-- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/cron.php b/cron.php index 2610dac31..9af2f9acb 100644 --- a/cron.php +++ b/cron.php @@ -6,7 +6,7 @@ * Handles incoming requests to fire off regularly-scheduled tasks (cron jobs). */ -include_once 'includes/bootstrap.inc'; +include_once './includes/bootstrap.inc'; drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); // If not in 'safe mode', increase the maximum execution time: diff --git a/database/updates.inc b/database/updates.inc index 27a87d8a8..f6027f786 100644 --- a/database/updates.inc +++ b/database/updates.inc @@ -545,7 +545,7 @@ function update_132() { /** * Wipe the search index */ - include_once('modules/search.module'); + include_once './modules/search.module'; search_wipe(); } diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index f29a9b6be..db111b428 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -460,7 +460,7 @@ function drupal_load($type, $name) { $filename = drupal_get_filename($type, $name); if ($filename) { - include_once($filename); + include_once "./$filename"; $files[$type][$name] = TRUE; return TRUE; diff --git a/includes/database.inc b/includes/database.inc index 42d186585..0fe82d247 100644 --- a/includes/database.inc +++ b/includes/database.inc @@ -110,10 +110,10 @@ function db_set_active($name = 'default') { } $db_type = substr($connect_url, 0, strpos($connect_url, '://')); - $handler = "includes/database.$db_type.inc"; + $handler = "./includes/database.$db_type.inc"; if (is_file($handler)) { - include_once($handler); + include_once $handler; } else { drupal_maintenance_theme(); diff --git a/includes/image.inc b/includes/image.inc index 1b1301a2c..9dea8d52c 100644 --- a/includes/image.inc +++ b/includes/image.inc @@ -11,7 +11,7 @@ function image_get_available_toolkits() { $output = array(); foreach ($toolkits as $file => $toolkit) { - include_once($file); + include_once "./$file"; $function = str_replace('.', '_', $toolkit->name) .'_info'; if (function_exists($function)) { $info = $function(); @@ -31,7 +31,7 @@ function image_get_toolkit() { static $toolkit; if (!$toolkit) { $toolkit = variable_get('image_toolkit', 'gd'); - $toolkit_file = 'includes/image.'.$toolkit.'.inc'; + $toolkit_file = './includes/image.'.$toolkit.'.inc'; if ($toolkit != 'gd' && file_exists($toolkit_file)) { include_once $toolkit_file; } diff --git a/includes/theme.inc b/includes/theme.inc index d6ded08ed..7a7e7e66f 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -68,11 +68,11 @@ function init_theme() { if (strpos($themes[$theme]->filename, '.theme')) { // file is a theme; include it - include_once($themes[$theme]->filename); + include_once './' . $themes[$theme]->filename; } elseif (strpos($themes[$theme]->description, '.engine')) { // file is a template; include its engine - include_once($themes[$theme]->description); + include_once './' . $themes[$theme]->description; $theme_engine = basename($themes[$theme]->description, '.engine'); if (function_exists($theme_engine .'_init')) { call_user_func($theme_engine .'_init', $themes[$theme]); diff --git a/modules/locale.module b/modules/locale.module index a59bd6c7b..58deceb63 100644 --- a/modules/locale.module +++ b/modules/locale.module @@ -258,7 +258,7 @@ function locale_get_plural($count) { * Page handler for the language management screen */ function locale_admin_manage() { - include_once 'includes/locale.inc'; + include_once './includes/locale.inc'; $edit = &$_POST['edit']; if ($_POST['op'] == t('Save configuration')) { @@ -290,7 +290,7 @@ function locale_admin_manage() { * User interface for the language deletion confirmation screen */ function locale_admin_manage_delete_screen() { - include_once 'includes/locale.inc'; + include_once './includes/locale.inc'; $langcode = arg(4); $edit = $_POST['edit']; @@ -334,7 +334,7 @@ function locale_admin_manage_delete_screen() { * Page handler for the language addition screen */ function locale_admin_manage_add() { - include_once 'includes/locale.inc'; + include_once './includes/locale.inc'; $edit = &$_POST['edit']; $isocodes = _locale_get_iso639_list(); @@ -374,7 +374,7 @@ function locale_admin_manage_add() { * Page handler for the translation import screen */ function locale_admin_import() { - include_once 'includes/locale.inc'; + include_once './includes/locale.inc'; $edit = &$_POST['edit']; switch ($_POST['op']) { case t('Import'): @@ -408,7 +408,7 @@ function locale_admin_import() { * Page handler for the translation export screen */ function locale_admin_export() { - include_once 'includes/locale.inc'; + include_once './includes/locale.inc'; switch ($_POST['op']) { case t('Export'): _locale_export_po($_POST['edit']['langcode']); @@ -425,7 +425,7 @@ function locale_admin_export() { * Page handler for the string search and administration screen */ function locale_admin_string() { - include_once 'includes/locale.inc'; + include_once './includes/locale.inc'; $op = ($_POST['op'] ? $_POST['op'] : arg(3)); $edit =& $_POST['edit']; diff --git a/modules/locale/locale.module b/modules/locale/locale.module index a59bd6c7b..58deceb63 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -258,7 +258,7 @@ function locale_get_plural($count) { * Page handler for the language management screen */ function locale_admin_manage() { - include_once 'includes/locale.inc'; + include_once './includes/locale.inc'; $edit = &$_POST['edit']; if ($_POST['op'] == t('Save configuration')) { @@ -290,7 +290,7 @@ function locale_admin_manage() { * User interface for the language deletion confirmation screen */ function locale_admin_manage_delete_screen() { - include_once 'includes/locale.inc'; + include_once './includes/locale.inc'; $langcode = arg(4); $edit = $_POST['edit']; @@ -334,7 +334,7 @@ function locale_admin_manage_delete_screen() { * Page handler for the language addition screen */ function locale_admin_manage_add() { - include_once 'includes/locale.inc'; + include_once './includes/locale.inc'; $edit = &$_POST['edit']; $isocodes = _locale_get_iso639_list(); @@ -374,7 +374,7 @@ function locale_admin_manage_add() { * Page handler for the translation import screen */ function locale_admin_import() { - include_once 'includes/locale.inc'; + include_once './includes/locale.inc'; $edit = &$_POST['edit']; switch ($_POST['op']) { case t('Import'): @@ -408,7 +408,7 @@ function locale_admin_import() { * Page handler for the translation export screen */ function locale_admin_export() { - include_once 'includes/locale.inc'; + include_once './includes/locale.inc'; switch ($_POST['op']) { case t('Export'): _locale_export_po($_POST['edit']['langcode']); @@ -425,7 +425,7 @@ function locale_admin_export() { * Page handler for the string search and administration screen */ function locale_admin_string() { - include_once 'includes/locale.inc'; + include_once './includes/locale.inc'; $op = ($_POST['op'] ? $_POST['op'] : arg(3)); $edit =& $_POST['edit']; diff --git a/modules/system.module b/modules/system.module index e414d77b0..b0c22586c 100644 --- a/modules/system.module +++ b/modules/system.module @@ -392,13 +392,13 @@ function system_region_list($theme_key) { return $list[$theme_key]; } if (file_exists($file = dirname($theme->filename) .'/' . $theme_key . '.theme')) { - include_once($file); + include_once "./$file"; } $regions = function_exists($theme_key . '_regions') ? call_user_func($theme_key . '_regions') : array(); if (strpos($theme->description, '.engine')) { // File is a template; include its engine's regions. - include_once($theme->description); + include_once './' . $theme->description; $theme_engine = basename($theme->description, '.engine'); $engine_regions = function_exists($theme_engine . '_regions') ? call_user_func($theme_engine . '_regions') : array(); $regions = array_merge($engine_regions, $regions); diff --git a/modules/system/system.module b/modules/system/system.module index e414d77b0..b0c22586c 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -392,13 +392,13 @@ function system_region_list($theme_key) { return $list[$theme_key]; } if (file_exists($file = dirname($theme->filename) .'/' . $theme_key . '.theme')) { - include_once($file); + include_once "./$file"; } $regions = function_exists($theme_key . '_regions') ? call_user_func($theme_key . '_regions') : array(); if (strpos($theme->description, '.engine')) { // File is a template; include its engine's regions. - include_once($theme->description); + include_once './' . $theme->description; $theme_engine = basename($theme->description, '.engine'); $engine_regions = function_exists($theme_engine . '_regions') ? call_user_func($theme_engine . '_regions') : array(); $regions = array_merge($engine_regions, $regions); diff --git a/modules/user.module b/modules/user.module index 7d6efb7f0..fcfa6c924 100644 --- a/modules/user.module +++ b/modules/user.module @@ -370,7 +370,7 @@ function user_is_blocked($name) { */ function user_mail($mail, $subject, $message, $header) { if (variable_get('smtp_library', '') && file_exists(variable_get('smtp_library', ''))) { - include_once variable_get('smtp_library', ''); + include_once './' . variable_get('smtp_library', ''); return user_mail_wrapper($mail, $subject, $message, $header); } else { diff --git a/modules/user/user.module b/modules/user/user.module index 7d6efb7f0..fcfa6c924 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -370,7 +370,7 @@ function user_is_blocked($name) { */ function user_mail($mail, $subject, $message, $header) { if (variable_get('smtp_library', '') && file_exists(variable_get('smtp_library', ''))) { - include_once variable_get('smtp_library', ''); + include_once './' . variable_get('smtp_library', ''); return user_mail_wrapper($mail, $subject, $message, $header); } else { diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine index 37a4b315d..653020169 100644 --- a/themes/engines/phptemplate/phptemplate.engine +++ b/themes/engines/phptemplate/phptemplate.engine @@ -9,7 +9,7 @@ function phptemplate_init($template) { $file = dirname($template->filename) . '/template.php'; if (file_exists($file)) { - include_once($file); + include_once "./$file"; } } @@ -333,7 +333,7 @@ function _phptemplate_default($hook, $variables, $file = NULL) { if ($file) { extract($variables, EXTR_SKIP); // Extract the vars to local namespace ob_start(); // Start output buffering - include($file); // Include the file + include "./$file"; // Include the file $contents = ob_get_contents(); // Get the contents of the buffer ob_end_clean(); // End buffering and discard return $contents; // Return the contents -- cgit v1.2.3