Merge commit 'dd2c97c8bf14e9789224e4f1d308035fc16ec05b'

* commit 'dd2c97c8bf14e9789224e4f1d308035fc16ec05b':
  Fixed the tmp directory bug that affected courses with a - in the name. This updated the git version to what is in svn.
This error had been fixed in pg/lib/WeBWorK/PG/IO.pm.  This merge updates PGcore.pm to use the routine
directoryFromPath where the the final node of path was removed correctly.

Conflicts:
	lib/PGcore.pm

lib/PGcore.pm

@@ -829,8 +829,7 @@ sub surePathToTmpFile {
 	unless ( -e $tmpDirectory) {   # if by some unlucky chance the tmpDirectory hasn't been created, create it.
 	    my $parentDirectory =  $tmpDirectory;
 	    $parentDirectory =~s|/$||;  # remove a trailing /
-	    $parentDirectory =~s|/[^/]*$||; # remove last node
-	    $parentDirectory = $self->directoryFromPath($parentDirectory);
+		$parentDirectory = $self->directoryFromPath($parentDirectory);
 	    my ($perms, $groupID) = (stat $parentDirectory)[2,5];
         #warn "Creating tmp directory at $tmpDirectory, perms $perms groupID $groupID";
 		$self->createDirectory($tmpDirectory, $perms, $groupID)