Index: cron.php =================================================================== RCS file: /cvs/drupal/drupal/cron.php,v retrieving revision 1.31 diff -u -r1.31 cron.php --- cron.php 28 Aug 2005 18:26:20 -0000 1.31 +++ cron.php 7 Sep 2005 20:50:26 -0000 @@ -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: Index: database/updates.inc =================================================================== RCS file: /cvs/drupal/drupal/database/updates.inc,v retrieving revision 1.130 diff -u -r1.130 updates.inc --- database/updates.inc 7 Sep 2005 20:32:00 -0000 1.130 +++ database/updates.inc 7 Sep 2005 20:50:59 -0000 @@ -545,7 +545,7 @@ /** * Wipe the search index */ - include_once('modules/search.module'); + include_once './modules/search.module'; search_wipe(); } Index: includes/bootstrap.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v retrieving revision 1.65 diff -u -r1.65 bootstrap.inc --- includes/bootstrap.inc 29 Aug 2005 19:17:17 -0000 1.65 +++ includes/bootstrap.inc 7 Sep 2005 20:52:05 -0000 @@ -460,7 +460,7 @@ $filename = drupal_get_filename($type, $name); if ($filename) { - include_once($filename); + include_once "./$filename"; $files[$type][$name] = TRUE; return TRUE; Index: includes/database.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database.inc,v retrieving revision 1.43 diff -u -r1.43 database.inc --- includes/database.inc 25 Aug 2005 21:14:16 -0000 1.43 +++ includes/database.inc 7 Sep 2005 20:59:35 -0000 @@ -110,10 +110,10 @@ } $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(); Index: includes/image.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/image.inc,v retrieving revision 1.8 diff -u -r1.8 image.inc --- includes/image.inc 25 Aug 2005 21:14:16 -0000 1.8 +++ includes/image.inc 7 Sep 2005 20:58:52 -0000 @@ -11,7 +11,7 @@ $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,9 +31,9 @@ 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; + include_once "./$toolkit_file"; } elseif (!image_gd_check_settings()) { $toolkit = false; Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.257 diff -u -r1.257 theme.inc --- includes/theme.inc 6 Sep 2005 20:32:53 -0000 1.257 +++ includes/theme.inc 7 Sep 2005 20:54:04 -0000 @@ -68,11 +68,11 @@ 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]); Index: modules/locale.module =================================================================== RCS file: /cvs/drupal/drupal/modules/locale.module,v retrieving revision 1.124 diff -u -r1.124 locale.module --- modules/locale.module 25 Aug 2005 21:14:16 -0000 1.124 +++ modules/locale.module 7 Sep 2005 20:56:11 -0000 @@ -258,7 +258,7 @@ * 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 @@ * 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 @@ * 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 @@ * 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 @@ * 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 @@ * 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']; Index: modules/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system.module,v retrieving revision 1.229 diff -u -r1.229 system.module --- modules/system.module 28 Aug 2005 18:17:47 -0000 1.229 +++ modules/system.module 7 Sep 2005 20:56:40 -0000 @@ -392,13 +392,13 @@ 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); Index: modules/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user.module,v retrieving revision 1.505 diff -u -r1.505 user.module --- modules/user.module 7 Sep 2005 20:41:38 -0000 1.505 +++ modules/user.module 7 Sep 2005 20:57:15 -0000 @@ -370,7 +370,7 @@ */ 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 { Index: sites/default/settings.php =================================================================== RCS file: /cvs/drupal/drupal/sites/default/settings.php,v retrieving revision 1.17 diff -u -r1.17 settings.php --- sites/default/settings.php 28 Aug 2005 18:26:20 -0000 1.17 +++ sites/default/settings.php 7 Sep 2005 15:16:37 -0000 @@ -76,9 +76,10 @@ * * Database URL format: * $db_url = 'mysql://username:password@localhost/database'; + * $db_url = 'mysqli://username:password@localhost/database'; * $db_url = 'pgsql://username:password@localhost/database'; */ -$db_url = 'mysql://username:password@localhost/database'; +$db_url = 'mysql://drupal:drupal@localhost/drupal'; $db_prefix = ''; /** @@ -87,7 +88,7 @@ * The URL of your website's main page. It is not allowed to have * a trailing slash; Drupal will add it for you. */ -$base_url = 'http://localhost'; +$base_url = 'http://localhost/drupal_cvs/drupal'; /** * PHP settings: Index: themes/bluemarine/page.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/themes/bluemarine/page.tpl.php,v retrieving revision 1.9 diff -u -r1.9 page.tpl.php --- themes/bluemarine/page.tpl.php 24 Aug 2005 15:28:53 -0000 1.9 +++ themes/bluemarine/page.tpl.php 7 Sep 2005 19:32:12 -0000 @@ -6,6 +6,7 @@ + > Index: themes/engines/phptemplate/phptemplate.engine =================================================================== RCS file: /cvs/drupal/drupal/themes/engines/phptemplate/phptemplate.engine,v retrieving revision 1.15 diff -u -r1.15 phptemplate.engine --- themes/engines/phptemplate/phptemplate.engine 4 Sep 2005 13:52:08 -0000 1.15 +++ themes/engines/phptemplate/phptemplate.engine 7 Sep 2005 21:00:06 -0000 @@ -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 @@ 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