Not sure if it is it…
Some comments
Some more move/copy fixes
After some more review figured no need to pass the oldfolder. Just call it before _move() changes it to the new one.
Remove debuglog calls.
Merge branch 'movefix'
Merge remote-tracking branch 'upstream/master' into upstream

Note that there is no code taken from the merge for a couple of reasons.

First, the fix is already in ZenPhoto20. We are much quicker at figuring out how things should work! Strange that the code submitted for the real fix seems an exact copy of the code that already existed in ZenPhoto20. I guess that should be a compliment, but seems a bit un-ethical to say that "research" has shown the right path without acknowledging the source of the research.

Second, there is a redundand assignment in the admin-functions.php script setting a varaiable that is never used (shame on you.) Maybe your "research" failed you here?

Conflicts:
	zp-core/admin-functions.php
	zp-core/class-album.php