@@ -640,8 +640,7 @@ discard block |
||
| 640 | 640 | if (!$srcSize){ |
| 641 | 641 | $poids_img[$src] = filesize($src); |
| 642 | 642 | } |
| 643 | - } |
|
| 644 | - elseif (strpos($src, '<svg') !== false) { |
|
| 643 | + } elseif (strpos($src, '<svg') !== false) { |
|
| 645 | 644 | include_spip('inc/svg'); |
| 646 | 645 | if ($attrs = svg_lire_attributs($src)) { |
| 647 | 646 | [$width, $height, $viewbox] = svg_getimagesize_from_attr($attrs); |
@@ -3497,8 +3496,7 @@ discard block |
||
| 3497 | 3496 | ) { |
| 3498 | 3497 | if ($variante_svg_size = substr($variante_svg_generique, 0, -6) . $m[1] . '.svg' and file_exists($variante_svg_size)) { |
| 3499 | 3498 | $img_file = $variante_svg_size; |
| 3500 | - } |
|
| 3501 | - else { |
|
| 3499 | + } else { |
|
| 3502 | 3500 | $img_file = $variante_svg_generique; |
| 3503 | 3501 | } |
| 3504 | 3502 | } |
@@ -3530,8 +3528,7 @@ discard block |
||
| 3530 | 3528 | } |
| 3531 | 3529 | if (!isset($options['chemin_image']) or $options['chemin_image'] == true) { |
| 3532 | 3530 | $img_file = chemin_image($img); |
| 3533 | - } |
|
| 3534 | - else { |
|
| 3531 | + } else { |
|
| 3535 | 3532 | if (!isset($options['variante_svg_si_possible']) or $options['variante_svg_si_possible'] == true) { |
| 3536 | 3533 | $img_file = http_img_variante_svg_si_possible($img_file); |
| 3537 | 3534 | } |
@@ -3561,11 +3558,9 @@ discard block |
||
| 3561 | 3558 | } |
| 3562 | 3559 | if ($alt === false) { |
| 3563 | 3560 | $alt = ''; |
| 3564 | - } |
|
| 3565 | - elseif ($alt or $alt === '') { |
|
| 3561 | + } elseif ($alt or $alt === '') { |
|
| 3566 | 3562 | $alt = " alt='" . attribut_html($alt) . "'"; |
| 3567 | - } |
|
| 3568 | - else { |
|
| 3563 | + } else { |
|
| 3569 | 3564 | $alt = " alt='" . attribut_html($title) . "'"; |
| 3570 | 3565 | } |
| 3571 | 3566 | return "<img src='$img_file'$alt" |
@@ -3692,13 +3687,11 @@ discard block |
||
| 3692 | 3687 | if (!is_null($class)) { |
| 3693 | 3688 | if (strlen($class)) { |
| 3694 | 3689 | $img = inserer_attribut($img, 'class', $class); |
| 3695 | - } |
|
| 3696 | - else { |
|
| 3690 | + } else { |
|
| 3697 | 3691 | $img = vider_attribut($img, 'class'); |
| 3698 | 3692 | } |
| 3699 | 3693 | } |
| 3700 | - } |
|
| 3701 | - else { |
|
| 3694 | + } else { |
|
| 3702 | 3695 | $img = http_img_pack( |
| 3703 | 3696 | $img, |
| 3704 | 3697 | $alt, |
@@ -3796,8 +3789,7 @@ discard block |
||
| 3796 | 3789 | if (!is_null($class)) { |
| 3797 | 3790 | if (strlen($class)) { |
| 3798 | 3791 | $balise_svg = inserer_attribut($balise_svg, 'class', $class); |
| 3799 | - } |
|
| 3800 | - else { |
|
| 3792 | + } else { |
|
| 3801 | 3793 | $balise_svg = vider_attribut($balise_svg, 'class'); |
| 3802 | 3794 | } |
| 3803 | 3795 | } |
@@ -3809,8 +3801,7 @@ discard block |
||
| 3809 | 3801 | $balise_svg = inserer_attribut($balise_svg, 'aria-labelledby', $id); |
| 3810 | 3802 | $title = "<title id=\"$id\">" . entites_html($alt) . "</title>\n"; |
| 3811 | 3803 | $balise_svg .= $title; |
| 3812 | - } |
|
| 3813 | - else { |
|
| 3804 | + } else { |
|
| 3814 | 3805 | $balise_svg = inserer_attribut($balise_svg, 'aria-hidden', 'true'); |
| 3815 | 3806 | } |
| 3816 | 3807 | |
@@ -5218,8 +5209,7 @@ discard block |
||
| 5218 | 5209 | // reduit la variabilite du nom et donc le nombre de css concatenees possibles in fine |
| 5219 | 5210 | if (isset($options['hash_on_content']) and $options['hash_on_content']) { |
| 5220 | 5211 | $hash = md5($contexte_implicite['host'] . '::' . $cache); |
| 5221 | - } |
|
| 5222 | - else { |
|
| 5212 | + } else { |
|
| 5223 | 5213 | unset($contexte_implicite['notes']); // pas pertinent pour signaler un changeemnt de contenu pour des css/js |
| 5224 | 5214 | ksort($contexte); |
| 5225 | 5215 | $hash = md5($fond . json_encode($contexte_implicite, JSON_THROW_ON_ERROR) . json_encode($contexte, JSON_THROW_ON_ERROR) . $connect); |