diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-03-31 15:36:48 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-03-31 15:36:48 +0000 |
| commit | 108011af8b9e5c28f90d807b6e69297f8500ad80 (patch) | |
| tree | 8a4a726e27d5b35be811bebfcd9c7b32f0e40e4b /includes | |
| parent | d35cf3f36e47c0a3f7f2dead211624387dda4275 (diff) | |
| download | brdo-108011af8b9e5c28f90d807b6e69297f8500ad80.tar.gz brdo-108011af8b9e5c28f90d807b6e69297f8500ad80.tar.bz2 | |
- Patch #756498 by douggreen: restore current directory after register_shutdown_function() callback.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/bootstrap.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 6deab8a79..8d6dae5bf 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -2673,7 +2673,7 @@ function &drupal_register_shutdown_function($callback = NULL, $parameters = NULL $args = func_get_args(); array_shift($args); // Save callback and arguments - $callbacks[] = array('callback' => $callback, 'arguments' => $args); + $callbacks[] = array('callback' => $callback, 'arguments' => $args, 'cwd' => getcwd()); } return $callbacks; } @@ -2686,6 +2686,7 @@ function _drupal_shutdown_function() { try { while (list($key, $callback) = each($callbacks)) { + chdir($callback['cwd']); call_user_func_array($callback['callback'], $callback['arguments']); } } |