Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
z-push
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Björn Fischer
z-push
Commits
77c74dc9
Commit
77c74dc9
authored
Aug 12, 2016
by
Ralf Becker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ZP-1018 delete folder broken in diffbackend.
Released under the Affero GNU General Public License (AGPL) version 3.
parent
2c514c06
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
importchangesdiff.php
src/lib/default/diffbackend/importchangesdiff.php
+1
-1
No files found.
src/lib/default/diffbackend/importchangesdiff.php
View file @
77c74dc9
...
...
@@ -260,7 +260,7 @@ class ImportChangesDiff extends DiffState implements IImportChanges {
if
(
isset
(
$folder
->
type
)
&&
Utils
::
IsSystemFolder
(
$folder
->
type
))
throw
new
StatusException
(
sprintf
(
"ImportChangesDiff->ImportFolderDeletion('%s','%s'): Error deleting system/default folder"
,
$id
,
$parent
),
SYNC_FSSTATUS_SYSTEMFOLDER
);
$ret
=
$this
->
backend
->
DeleteFolder
(
$
folder
);
$ret
=
$this
->
backend
->
DeleteFolder
(
$
id
,
$parent
);
if
(
!
$ret
)
throw
new
StatusException
(
sprintf
(
"ImportChangesDiff->ImportFolderDeletion('%s','%s'): can not be deleted"
,
$id
,
$parent
),
SYNC_FSSTATUS_FOLDERDOESNOTEXIST
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment