Merge ../pl

Conflicts:
	post.php
This commit is contained in:
czaks 2014-05-10 21:58:23 +02:00
commit 19ce50c545
290 changed files with 6 additions and 6 deletions

View file

@ -692,7 +692,7 @@ if (isset($_POST['delete'])) {
if (!$config['redraw_image'] && $config['use_exiftool']) {
if($error = shell_exec_error('exiftool -overwrite_original -ignoreMinorErrors -q -q -all= ' .
escapeshellarg($file['tmp_name'])))
error(_('Could not strip EXIF metadata!', null, $error));
error(_('Could not strip EXIF metadata!'), null, $error);
} else {
$image->to($file['file']);
$dont_copy_file = true;