Skip to content

Commit e2555ab

Browse files
sy-recordssy-records
committed
Remove duplicate definitions of base 
1 parent 1f1e29c commit e2555ab

1 file changed

Lines changed: 20 additions & 24 deletions

File tree

‎include/header.inc‎

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -58,43 +58,39 @@ if (!isset($config["languages"])) {
5858
<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php echo $lang?>">
5959
<head>
6060

61-
<meta charset="utf-8">
62-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
61+
<meta charset="utf-8">
62+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6363

64-
<?php if (!empty($_SERVER["BASE_HREF"])): ?>
65-
<base href="<?php echo $_SERVER["BASE_HREF"]; ?>">
66-
<?php endif ?>
64+
<title><?php echo $title ?></title>
6765

68-
<title><?php echo $title ?></title>
69-
70-
<?php foreach($CSS as $filename => $modified): ?>
71-
<link rel="stylesheet" type="text/css" href="/cached.php?t=<?php echo $modified?>&amp;f=<?php echo $filename?>" media="screen">
72-
<?php endforeach ?>
66+
<?php foreach($CSS as $filename => $modified): ?>
67+
<link rel="stylesheet" type="text/css" href="/cached.php?t=<?php echo $modified?>&amp;f=<?php echo $filename?>" media="screen">
68+
<?php endforeach ?>
7369

74-
<link rel="icon" type="image/svg+xml" sizes="any" href="<?php echo $MYSITE ?>favicon.svg?v=2">
75-
<link rel="icon" type="image/png" sizes="196x196" href="<?php echo $MYSITE ?>favicon-196x196.png?v=2">
76-
<link rel="icon" type="image/png" sizes="32x32" href="<?php echo $MYSITE ?>favicon-32x32.png?v=2">
77-
<link rel="icon" type="image/png" sizes="16x16" href="<?php echo $MYSITE ?>favicon-16x16.png?v=2">
78-
<link rel="shortcut icon" href="<?php echo $MYSITE ?>favicon.ico?v=2">
70+
<link rel="icon" type="image/svg+xml" sizes="any" href="<?php echo $MYSITE ?>favicon.svg?v=2">
71+
<link rel="icon" type="image/png" sizes="196x196" href="<?php echo $MYSITE ?>favicon-196x196.png?v=2">
72+
<link rel="icon" type="image/png" sizes="32x32" href="<?php echo $MYSITE ?>favicon-32x32.png?v=2">
73+
<link rel="icon" type="image/png" sizes="16x16" href="<?php echo $MYSITE ?>favicon-16x16.png?v=2">
74+
<link rel="shortcut icon" href="<?php echo $MYSITE ?>favicon.ico?v=2">
7975

80-
<link rel="search" type="application/opensearchdescription+xml" href="https://www.php.net/phpnetimprovedsearch.src" title="Add PHP.net search">
81-
<link rel="alternate" type="application/atom+xml" href="<?php echo $MYSITE ?>releases/feed.php" title="PHP Release feed">
82-
<link rel="alternate" type="application/atom+xml" href="<?php echo $MYSITE ?>feed.atom" title="PHP: Hypertext Preprocessor">
76+
<link rel="search" type="application/opensearchdescription+xml" href="https://www.php.net/phpnetimprovedsearch.src" title="Add PHP.net search">
77+
<link rel="alternate" type="application/atom+xml" href="<?php echo $MYSITE ?>releases/feed.php" title="PHP Release feed">
78+
<link rel="alternate" type="application/atom+xml" href="<?php echo $MYSITE ?>feed.atom" title="PHP: Hypertext Preprocessor">
8379

8480
<?php if (isset($_SERVER['BASE_PAGE'])): ?>
85-
<link rel="canonical" href="https://www.php.net/<?php echo $_SERVER['BASE_PAGE']?>">
81+
<link rel="canonical" href="https://www.php.net/<?php echo $_SERVER['BASE_PAGE']?>">
8682
<?php if ($shortname): ?>
87-
<link rel="shorturl" href="<?php echo $shorturl ?>">
88-
<link rel="alternate" href="<?php echo $shorturl ?>" hreflang="x-default">
83+
<link rel="shorturl" href="<?php echo $shorturl ?>">
84+
<link rel="alternate" href="<?php echo $shorturl ?>" hreflang="x-default">
8985
<?php endif ?>
9086
<?php endif ?>
9187

9288
<?php foreach($config["meta-navigation"] as $rel => $page): ?>
93-
<link rel="<?php echo $rel ?>" href="<?php echo $MYSITE ?><?php echo $page ?>">
89+
<link rel="<?php echo $rel ?>" href="<?php echo $MYSITE ?><?php echo $page ?>">
9490
<?php endforeach ?>
9591

9692
<?php foreach($config["languages"] as $code): ?>
97-
<link rel="alternate" href="<?php echo $MYSITE ?>manual/<?php echo $code?>/<?php echo $config["thispage"] ?>" hreflang="<?php echo $code?>">
93+
<link rel="alternate" href="<?php echo $MYSITE ?>manual/<?php echo $code?>/<?php echo $config["thispage"] ?>" hreflang="<?php echo $code?>">
9894
<?php endforeach ?>
9995

10096
<?php foreach($CSS as $filename => $modified): ?>
@@ -106,7 +102,7 @@ if (!isset($config["languages"])) {
106102
<?php endforeach ?>
107103

108104
<?php if (!empty($_SERVER["BASE_HREF"])): ?>
109-
<base href="<?php echo $_SERVER["BASE_HREF"] ?>">
105+
<base href="<?php echo $_SERVER["BASE_HREF"] ?>">
110106
<?php endif ?>
111107

112108
<?php if (isset($config['meta_tags'])) { echo $config['meta_tags']; } ?>

0 commit comments

Comments
 (0)