Merge branch 'master' of git://github.com/colosa/processmaker into BUG-11603

This commit is contained in:
Luis Fernando Saisa Lopez
2013-07-01 15:44:00 +00:00
31 changed files with 326 additions and 96 deletions

View File

@@ -2614,7 +2614,7 @@ class G
G::verifyPath( $path, true );
}
move_uploaded_file( $file, $path . "/" . $nameToSave );
chmod( $path . "/" . $nameToSave, $permission );
@chmod( $path . "/" . $nameToSave, $permission );
umask( $oldumask );
} catch (Exception $oException) {
throw $oException;
@@ -2676,7 +2676,7 @@ class G
imagecopyresampled( $image_p, $image, 0, 0, 0, 0, $resWidth, $resHeight, $width, $height );
$outputFn( $image_p, $saveTo );
chmod( $saveTo, 0666 );
@chmod( $saveTo, 0666 );
}
/**
@@ -4804,7 +4804,7 @@ class G
} else {
//first a raw permission check
if(fileperms($file) != 33200) {
chmod ($file, 0660);
@chmod ($file, 0660);
}
}
}