Skip to content
This repository has been archived by the owner on Sep 10, 2021. It is now read-only.

Commit

Permalink
BUG: Refs #0309. Fixed failed style tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
yuzhengZ committed Nov 21, 2011
1 parent 41f6776 commit ff395f2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion core/controllers/BrowseController.php
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public function getfolderscontentAction()
$tmp['folder_id'] = $folder->getFolderId();
$tmp['name'] = $folder->getName();
$tmp['date_update'] = $this->Component->Date->ago($folder->getDateUpdate(), true);
if ($tmp['name'] == 'Public' || $tmp['name'] == 'Private')
if($tmp['name'] == 'Public' || $tmp['name'] == 'Private')
{
$tmp['deletable'] = 'false';
}
Expand Down
2 changes: 1 addition & 1 deletion core/controllers/FolderController.php
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ public function deleteAction()
throw new Zend_Exception("Community Folder. You cannot delete it.");
}
// User cannot delete its root folder, the default 'Public' folder and the default 'Private' folder
if(($this->Folder->getUser($parent) != false && ($folderName == 'Public' || $folderName == 'Private')) || $this->Folder->getUser($folder) != false)
if(($this->Folder->getUser($parent) != false && ($folderName == 'Public' || $folderName == 'Private')) || $this->Folder->getUser($folder) != false)
{
throw new Zend_Exception("User Folder. You cannot delete it.");
}
Expand Down

0 comments on commit ff395f2

Please sign in to comment.