From be09e5a90dc759d86c6a96f89e5e9c82cb9f1cae Mon Sep 17 00:00:00 2001 From: gwoo Date: Sun, 9 Mar 2008 22:14:12 +0000 Subject: [PATCH] closes #3915, Folder delete does not require path git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6542 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/folder.php | 5 ++++- cake/tests/cases/libs/folder.test.php | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/cake/libs/folder.php b/cake/libs/folder.php index ebfe0ed0c..01b5a6da3 100644 --- a/cake/libs/folder.php +++ b/cake/libs/folder.php @@ -530,7 +530,10 @@ class Folder extends Object{ * @return boolean Success * @access public */ - function delete($path) { + function delete($path = null) { + if (!$path) { + $path = $this->pwd(); + } $path = $this->slashTerm($path); if (is_dir($path) === true) { $files = glob($path . "*", GLOB_NOSORT); diff --git a/cake/tests/cases/libs/folder.test.php b/cake/tests/cases/libs/folder.test.php index fbdde855e..41d800672 100644 --- a/cake/tests/cases/libs/folder.test.php +++ b/cake/tests/cases/libs/folder.test.php @@ -106,6 +106,17 @@ class FolderTest extends UnitTestCase { $result = $Folder->delete($mv); $this->assertTrue($result); + + $new = TMP . 'test_folder_new'; + $result = $Folder->create($new); + $this->assertTrue($result); + + $result = $Folder->cd($new); + $this->assertTrue($result); + + $result = $Folder->delete(); + $this->assertTrue($result); + } function testRealPathForWebroot() {