Skip to content

Commit be9dc65

Browse files
committed
Merge remote-tracking branch 'origin/preview' into refresh-homepage
2 parents 84abeaf + d353cf2 commit be9dc65

3 files changed

Lines changed: 7 additions & 8 deletions

File tree

include/header.inc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ $css_files = [
77
'/fonts/Font-Awesome/css/fontello.css',
88
'/styles/theme-base.css',
99
'/styles/theme-medium.css',
10-
// '/styles/theme-gst.css',
1110
];
1211

1312
if (isset($config['css'])) {

include/layout.inc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,9 @@ function get_news_changes()
557557

558558
$date->modify("+1 week");
559559
if ($date->getTimestamp() > $_SERVER["REQUEST_TIME"]) {
560-
assert(isset($lastNews["link"][0]["href"]));
560+
if (!isset($lastNews["link"][0]["href"])) {
561+
return false;
562+
}
561563

562564
$link = preg_replace('~^(http://php.net/|https://www.php.net/)~', '/', $lastNews["link"][0]["href"]);
563565
$title = $lastNews["title"];

public/index.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,15 @@
1313
(function ($uri): void {
1414
// Special redirect cases not able to be captured in error.php
1515
$shortcuts = [
16-
'/?:' => '/language.operators.comparison#language.operators.comparison.ternary',
17-
'/??' => '/language.operators.comparison#language.operators.comparison.coalesce',
18-
'/??=' => '/language.operators.assignment#language.operators.assignment.other',
16+
'/?:' => '/language.operators.comparison#language.operators.comparison.ternary',
17+
'/??' => '/language.operators.comparison#language.operators.comparison.coalesce',
18+
'/??=' => '/language.operators.assignment#language.operators.assignment.other',
1919
];
2020
if (isset($shortcuts[$uri])) {
2121
header("Location: {$shortcuts[$uri]}");
2222
exit;
2323
}
24-
})(
25-
$_SERVER['REQUEST_URI'] ?? ''
26-
);
24+
})($_SERVER['REQUEST_URI'] ?? '');
2725

2826
/**
2927
* @phpstan-import-type NormalizedReleaseStruct from Branches

0 commit comments

Comments
 (0)