Merge ../pl
Conflicts: post.php
@ -1105,9 +1105,9 @@
|
|||||||
|
|
||||||
// Static images. These can be URLs OR base64 (data URI scheme). These are only used if
|
// Static images. These can be URLs OR base64 (data URI scheme). These are only used if
|
||||||
// $config['font_awesome'] is false (default).
|
// $config['font_awesome'] is false (default).
|
||||||
// $config['image_sticky'] = 'static/sticky.gif';
|
// $config['image_sticky'] = 'static/sticky.png';
|
||||||
// $config['image_locked'] = 'static/locked.gif';
|
// $config['image_locked'] = 'static/locked.gif';
|
||||||
// $config['image_bumplocked'] = 'static/sage.gif'.
|
// $config['image_bumplocked'] = 'static/sage.png'.
|
||||||
|
|
||||||
// If you want to put images and other dynamic-static stuff on another (preferably cookieless) domain.
|
// If you want to put images and other dynamic-static stuff on another (preferably cookieless) domain.
|
||||||
// This will override $config['root'] and $config['dir']['...'] directives. "%s" will get replaced with
|
// This will override $config['root'] and $config['dir']['...'] directives. "%s" will get replaced with
|
||||||
|
2
post.php
@ -692,7 +692,7 @@ if (isset($_POST['delete'])) {
|
|||||||
if (!$config['redraw_image'] && $config['use_exiftool']) {
|
if (!$config['redraw_image'] && $config['use_exiftool']) {
|
||||||
if($error = shell_exec_error('exiftool -overwrite_original -ignoreMinorErrors -q -q -all= ' .
|
if($error = shell_exec_error('exiftool -overwrite_original -ignoreMinorErrors -q -q -all= ' .
|
||||||
escapeshellarg($file['tmp_name'])))
|
escapeshellarg($file['tmp_name'])))
|
||||||
error(_('Could not strip EXIF metadata!', null, $error));
|
error(_('Could not strip EXIF metadata!'), null, $error);
|
||||||
} else {
|
} else {
|
||||||
$image->to($file['file']);
|
$image->to($file['file']);
|
||||||
$dont_copy_file = true;
|
$dont_copy_file = true;
|
||||||
|
Before Width: | Height: | Size: 67 B After Width: | Height: | Size: 59 B |
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 2.7 KiB |
BIN
static/file.png
Before Width: | Height: | Size: 6.0 KiB After Width: | Height: | Size: 3.9 KiB |
Before Width: | Height: | Size: 643 B After Width: | Height: | Size: 451 B |
Before Width: | Height: | Size: 408 B After Width: | Height: | Size: 330 B |
Before Width: | Height: | Size: 604 B After Width: | Height: | Size: 418 B |
Before Width: | Height: | Size: 591 B After Width: | Height: | Size: 455 B |
Before Width: | Height: | Size: 643 B After Width: | Height: | Size: 516 B |
Before Width: | Height: | Size: 600 B After Width: | Height: | Size: 431 B |
Before Width: | Height: | Size: 497 B After Width: | Height: | Size: 331 B |
Before Width: | Height: | Size: 488 B After Width: | Height: | Size: 409 B |
Before Width: | Height: | Size: 611 B After Width: | Height: | Size: 429 B |
Before Width: | Height: | Size: 506 B After Width: | Height: | Size: 364 B |
Before Width: | Height: | Size: 647 B After Width: | Height: | Size: 538 B |
Before Width: | Height: | Size: 403 B After Width: | Height: | Size: 290 B |
Before Width: | Height: | Size: 673 B After Width: | Height: | Size: 579 B |
Before Width: | Height: | Size: 524 B After Width: | Height: | Size: 393 B |
Before Width: | Height: | Size: 663 B After Width: | Height: | Size: 476 B |
Before Width: | Height: | Size: 589 B After Width: | Height: | Size: 420 B |
Before Width: | Height: | Size: 593 B After Width: | Height: | Size: 469 B |
Before Width: | Height: | Size: 585 B After Width: | Height: | Size: 402 B |
Before Width: | Height: | Size: 504 B After Width: | Height: | Size: 368 B |
Before Width: | Height: | Size: 449 B After Width: | Height: | Size: 294 B |
Before Width: | Height: | Size: 497 B After Width: | Height: | Size: 341 B |
Before Width: | Height: | Size: 462 B After Width: | Height: | Size: 320 B |
Before Width: | Height: | Size: 457 B After Width: | Height: | Size: 376 B |
Before Width: | Height: | Size: 675 B After Width: | Height: | Size: 564 B |
Before Width: | Height: | Size: 486 B After Width: | Height: | Size: 310 B |
Before Width: | Height: | Size: 369 B After Width: | Height: | Size: 368 B |
Before Width: | Height: | Size: 611 B After Width: | Height: | Size: 499 B |
Before Width: | Height: | Size: 639 B After Width: | Height: | Size: 500 B |
Before Width: | Height: | Size: 500 B After Width: | Height: | Size: 341 B |
Before Width: | Height: | Size: 310 B After Width: | Height: | Size: 309 B |
Before Width: | Height: | Size: 593 B After Width: | Height: | Size: 477 B |
Before Width: | Height: | Size: 526 B After Width: | Height: | Size: 391 B |
Before Width: | Height: | Size: 631 B After Width: | Height: | Size: 470 B |
Before Width: | Height: | Size: 512 B After Width: | Height: | Size: 397 B |
Before Width: | Height: | Size: 443 B After Width: | Height: | Size: 326 B |
Before Width: | Height: | Size: 514 B After Width: | Height: | Size: 382 B |
Before Width: | Height: | Size: 600 B After Width: | Height: | Size: 474 B |
Before Width: | Height: | Size: 628 B After Width: | Height: | Size: 470 B |
Before Width: | Height: | Size: 625 B After Width: | Height: | Size: 493 B |
Before Width: | Height: | Size: 571 B After Width: | Height: | Size: 457 B |
Before Width: | Height: | Size: 614 B After Width: | Height: | Size: 454 B |
Before Width: | Height: | Size: 521 B After Width: | Height: | Size: 379 B |
Before Width: | Height: | Size: 367 B After Width: | Height: | Size: 287 B |
Before Width: | Height: | Size: 453 B After Width: | Height: | Size: 304 B |
Before Width: | Height: | Size: 586 B After Width: | Height: | Size: 488 B |
Before Width: | Height: | Size: 450 B After Width: | Height: | Size: 324 B |
Before Width: | Height: | Size: 525 B After Width: | Height: | Size: 347 B |
Before Width: | Height: | Size: 472 B After Width: | Height: | Size: 349 B |
Before Width: | Height: | Size: 483 B After Width: | Height: | Size: 330 B |
Before Width: | Height: | Size: 369 B After Width: | Height: | Size: 368 B |
Before Width: | Height: | Size: 477 B After Width: | Height: | Size: 349 B |
Before Width: | Height: | Size: 439 B After Width: | Height: | Size: 321 B |
Before Width: | Height: | Size: 563 B After Width: | Height: | Size: 440 B |
Before Width: | Height: | Size: 529 B After Width: | Height: | Size: 437 B |
Before Width: | Height: | Size: 608 B After Width: | Height: | Size: 489 B |
Before Width: | Height: | Size: 428 B After Width: | Height: | Size: 348 B |
Before Width: | Height: | Size: 476 B After Width: | Height: | Size: 363 B |
Before Width: | Height: | Size: 545 B After Width: | Height: | Size: 359 B |
Before Width: | Height: | Size: 658 B After Width: | Height: | Size: 575 B |
Before Width: | Height: | Size: 572 B After Width: | Height: | Size: 429 B |
Before Width: | Height: | Size: 495 B After Width: | Height: | Size: 352 B |
Before Width: | Height: | Size: 620 B After Width: | Height: | Size: 507 B |
Before Width: | Height: | Size: 508 B After Width: | Height: | Size: 368 B |
Before Width: | Height: | Size: 582 B After Width: | Height: | Size: 452 B |
Before Width: | Height: | Size: 344 B After Width: | Height: | Size: 342 B |
Before Width: | Height: | Size: 500 B After Width: | Height: | Size: 355 B |
Before Width: | Height: | Size: 429 B After Width: | Height: | Size: 351 B |
Before Width: | Height: | Size: 465 B After Width: | Height: | Size: 348 B |
Before Width: | Height: | Size: 508 B After Width: | Height: | Size: 386 B |
Before Width: | Height: | Size: 653 B After Width: | Height: | Size: 496 B |
Before Width: | Height: | Size: 469 B After Width: | Height: | Size: 342 B |
Before Width: | Height: | Size: 592 B After Width: | Height: | Size: 445 B |
Before Width: | Height: | Size: 418 B After Width: | Height: | Size: 411 B |
Before Width: | Height: | Size: 489 B After Width: | Height: | Size: 362 B |
Before Width: | Height: | Size: 610 B After Width: | Height: | Size: 516 B |
Before Width: | Height: | Size: 648 B After Width: | Height: | Size: 526 B |
Before Width: | Height: | Size: 552 B After Width: | Height: | Size: 406 B |
Before Width: | Height: | Size: 474 B After Width: | Height: | Size: 396 B |
Before Width: | Height: | Size: 545 B After Width: | Height: | Size: 367 B |
Before Width: | Height: | Size: 369 B After Width: | Height: | Size: 368 B |
Before Width: | Height: | Size: 489 B After Width: | Height: | Size: 342 B |
Before Width: | Height: | Size: 699 B After Width: | Height: | Size: 563 B |
Before Width: | Height: | Size: 637 B After Width: | Height: | Size: 458 B |
Before Width: | Height: | Size: 594 B After Width: | Height: | Size: 492 B |
Before Width: | Height: | Size: 369 B After Width: | Height: | Size: 368 B |
Before Width: | Height: | Size: 524 B After Width: | Height: | Size: 503 B |
Before Width: | Height: | Size: 490 B After Width: | Height: | Size: 336 B |
Before Width: | Height: | Size: 463 B After Width: | Height: | Size: 383 B |
Before Width: | Height: | Size: 470 B After Width: | Height: | Size: 351 B |
Before Width: | Height: | Size: 493 B After Width: | Height: | Size: 362 B |
Before Width: | Height: | Size: 480 B After Width: | Height: | Size: 319 B |
Before Width: | Height: | Size: 488 B After Width: | Height: | Size: 353 B |
Before Width: | Height: | Size: 537 B After Width: | Height: | Size: 404 B |
Before Width: | Height: | Size: 487 B After Width: | Height: | Size: 389 B |
Before Width: | Height: | Size: 630 B After Width: | Height: | Size: 522 B |