diff options
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/system.install | 4 | ||||
| -rw-r--r-- | modules/system/system.tar.inc | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/modules/system/system.install b/modules/system/system.install index 492df8365..d4da8b4a7 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -2351,10 +2351,10 @@ function system_update_7046() { variable_set('theme_garland_settings', $settings); // Remove Garland's color files since they won't match Minnelli's. foreach (variable_get('color_garland_files', array()) as $file) { - @unlink($file); + @drupal_unlink($file); } if (isset($file) && $file = dirname($file)) { - @rmdir($file); + @drupal_rmdir($file); } variable_del('color_garland_palette'); variable_del('color_garland_stylesheets'); diff --git a/modules/system/system.tar.inc b/modules/system/system.tar.inc index 30b0c2f55..fd1d3c825 100644 --- a/modules/system/system.tar.inc +++ b/modules/system/system.tar.inc @@ -210,7 +210,7 @@ class Archive_Tar // extends PEAR $this->_close(); // ----- Look for a local copy to delete if ($this->_temp_tarname != '') - @unlink($this->_temp_tarname); + @drupal_unlink($this->_temp_tarname); // $this->_PEAR(); } // }}} @@ -777,7 +777,7 @@ class Archive_Tar // extends PEAR // ----- Look if a local copy need to be erase // Note that it might be interesting to keep the url for a time : ToDo if ($this->_temp_tarname != '') { - @unlink($this->_temp_tarname); + @drupal_unlink($this->_temp_tarname); $this->_temp_tarname = ''; } @@ -793,11 +793,11 @@ class Archive_Tar // extends PEAR // ----- Look for a local copy if ($this->_temp_tarname != '') { // ----- Remove the local copy but not the remote tarname - @unlink($this->_temp_tarname); + @drupal_unlink($this->_temp_tarname); $this->_temp_tarname = ''; } else { // ----- Remove the local tarname file - @unlink($this->_tarname); + @drupal_unlink($this->_tarname); } $this->_tarname = ''; @@ -1603,7 +1603,7 @@ class Archive_Tar // extends PEAR } } elseif ($v_header['typeflag'] == "2") { if (@file_exists($v_header['filename'])) { - @unlink($v_header['filename']); + @drupal_unlink($v_header['filename']); } if (!@symlink($v_header['link'], $v_header['filename'])) { $this->_error('Unable to extract symbolic link {' @@ -1740,7 +1740,7 @@ class Archive_Tar // extends PEAR @bzclose($v_temp_tar); } - if (!@unlink($this->_tarname.".tmp")) { + if (!@drupal_unlink($this->_tarname.".tmp")) { $this->_error('Error while deleting temporary file \'' .$this->_tarname.'.tmp\''); } |