@@ -364,8 +364,7 @@ discard block |
||
| 364 | 364 | } |
| 365 | 365 | if (!isset($regs[2])) { |
| 366 | 366 | $niveau = _LOG_INFO; |
| 367 | - } |
|
| 368 | - else { |
|
| 367 | + } else { |
|
| 369 | 368 | $niveau = intval($regs[2]); |
| 370 | 369 | } |
| 371 | 370 | |
@@ -1475,8 +1474,7 @@ discard block |
||
| 1475 | 1474 | ) { |
| 1476 | 1475 | if ($fsize = substr($f, 0, -6) . $m[1] . '.svg' and file_exists($fsize)) { |
| 1477 | 1476 | return $themefiles["$subdir$file"] = $fsize; |
| 1478 | - } |
|
| 1479 | - else { |
|
| 1477 | + } else { |
|
| 1480 | 1478 | return $themefiles["$subdir$file"] = "$f?" . $m[1] . 'px'; |
| 1481 | 1479 | } |
| 1482 | 1480 | } |
@@ -3496,8 +3494,7 @@ discard block |
||
| 3496 | 3494 | if (!in_array('svg', $formats)) { |
| 3497 | 3495 | $formats[] = 'svg'; |
| 3498 | 3496 | } |
| 3499 | - } |
|
| 3500 | - else { |
|
| 3497 | + } else { |
|
| 3501 | 3498 | $formats = array_diff($formats, ['svg']); |
| 3502 | 3499 | } |
| 3503 | 3500 | return $formats; |
@@ -51,11 +51,9 @@ discard block |
||
| 51 | 51 | and (!$host or $host == 'localhost') |
| 52 | 52 | ) { |
| 53 | 53 | $link = @mysqli_connect($host, $login, $pass, '', null, $socket); |
| 54 | - } |
|
| 55 | - elseif ($port) { |
|
| 54 | + } elseif ($port) { |
|
| 56 | 55 | $link = @mysqli_connect($host, $login, $pass, '', $port); |
| 57 | - } |
|
| 58 | - else { |
|
| 56 | + } else { |
|
| 59 | 57 | $link = @mysqli_connect($host, $login, $pass); |
| 60 | 58 | } |
| 61 | 59 | |
@@ -1619,8 +1617,7 @@ discard block |
||
| 1619 | 1617 | if (!$type) { |
| 1620 | 1618 | if (is_bool($v)) { |
| 1621 | 1619 | return strval(intval($v)); |
| 1622 | - } |
|
| 1623 | - elseif (is_numeric($v)) { |
|
| 1620 | + } elseif (is_numeric($v)) { |
|
| 1624 | 1621 | return strval($v); |
| 1625 | 1622 | } |
| 1626 | 1623 | return "'" . addslashes($v) . "'"; |
@@ -42,8 +42,7 @@ |
||
| 42 | 42 | if (count($logo) < 6) { |
| 43 | 43 | spip_log("Supprimer ancien logo $logo", 'logo'); |
| 44 | 44 | spip_unlink($logo[0]); |
| 45 | - } |
|
| 46 | - elseif ( |
|
| 45 | + } elseif ( |
|
| 47 | 46 | $doc = $logo[5] |
| 48 | 47 | and isset($doc['id_document']) |
| 49 | 48 | and $id_document = $doc['id_document'] |