diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-10-23 11:18:20 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-10-23 11:18:20 +0200 |
| commit | 7a5236de3f13f08b8c51eb183c0dcf1c8c85beca (patch) | |
| tree | 10a09f07458ed1279e62646188cb42e87fe0ed8f /app/layout/simple.phtml | |
| parent | fdfd8ce9be182943e73d20ec3bff4d560c5b7503 (diff) | |
Take advantage of PHP 5.4+ short echo (#2585)
* Take advantage of PHP 5.4+ short echo
https://php.net/migration54.new-features thanks to
https://github.com/FreshRSS/FreshRSS/pull/2495
Use `<?= ?>` instead of `<?php echo; ?>`
10kB of code saved :-)
Done with regular expression:
```
<\?php echo (.+?);? *\?>
<?= \1 ?>
```
* Try Travis fix
https://github.com/squizlabs/PHP_CodeSniffer/issues/2045#issuecomment-395238272
Diffstat (limited to 'app/layout/simple.phtml')
| -rw-r--r-- | app/layout/simple.phtml | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/app/layout/simple.phtml b/app/layout/simple.phtml index b62e35988..89fe69005 100644 --- a/app/layout/simple.phtml +++ b/app/layout/simple.phtml @@ -1,24 +1,24 @@ <?php FreshRSS::preLayout(); ?> <!DOCTYPE html> -<html lang="<?php echo FreshRSS_Context::$user_conf->language; ?>" xml:lang="<?php echo FreshRSS_Context::$user_conf->language; ?>"> +<html lang="<?= FreshRSS_Context::$user_conf->language ?>" xml:lang="<?= FreshRSS_Context::$user_conf->language ?>"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="initial-scale=1.0" /> - <?php echo self::headStyle(); ?> + <?= self::headStyle() ?> <script id="jsonVars" type="application/json"> <?php $this->renderHelper('javascript_vars'); ?> </script> - <?php echo self::headScript(); ?> - <link rel="shortcut icon" id="favicon" type="image/x-icon" sizes="16x16 64x64" href="<?php echo Minz_Url::display('/favicon.ico'); ?>" /> - <link rel="icon msapplication-TileImage apple-touch-icon" type="image/png" sizes="256x256" href="<?php echo Minz_Url::display('/themes/icons/favicon-256.png'); ?>" /> - <link rel="apple-touch-icon" href="<?php echo Minz_Url::display('/themes/icons/apple-touch-icon.png'); ?>" /> + <?= self::headScript() ?> + <link rel="shortcut icon" id="favicon" type="image/x-icon" sizes="16x16 64x64" href="<?= Minz_Url::display('/favicon.ico') ?>" /> + <link rel="icon msapplication-TileImage apple-touch-icon" type="image/png" sizes="256x256" href="<?= Minz_Url::display('/themes/icons/favicon-256.png') ?>" /> + <link rel="apple-touch-icon" href="<?= Minz_Url::display('/themes/icons/apple-touch-icon.png') ?>" /> <meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-status-bar-style" content="black" /> - <meta name="apple-mobile-web-app-title" content="<?php echo FreshRSS_Context::$system_conf->title; ?>"> + <meta name="apple-mobile-web-app-title" content="<?= FreshRSS_Context::$system_conf->title ?>"> <meta name="msapplication-TileColor" content="#FFF" /> <meta name="referrer" content="never" /> <meta name="robots" content="noindex,nofollow" /> - <?php echo self::headTitle(); ?> + <?= self::headTitle() ?> </head> <body> @@ -27,9 +27,9 @@ <div class="header"> <div class="item title"> <h1> - <a href="<?php echo _url('index', 'index'); ?>"> - <img class="logo" src="<?php echo _i('icon', true); ?>" alt="" /> - <?php echo FreshRSS_Context::$system_conf->title; ?> + <a href="<?= _url('index', 'index') ?>"> + <img class="logo" src="<?= _i('icon', true) ?>" alt="" /> + <?= FreshRSS_Context::$system_conf->title ?> </a> </h1> </div> @@ -38,10 +38,10 @@ <div class="item"> <?php if (FreshRSS_Auth::accessNeedsAction()) { ?> - <a class="signout" href="<?php echo _url('auth', 'logout'); ?>"> - <?php echo _i('logout') . _t('gen.auth.logout'); ?> + <a class="signout" href="<?= _url('auth', 'logout') ?>"> + <?= _i('logout') . _t('gen.auth.logout') ?> - (<?php echo htmlspecialchars(Minz_Session::param('currentUser', '_'), ENT_NOQUOTES, 'UTF-8'); ?>) + (<?= htmlspecialchars(Minz_Session::param('currentUser', '_'), ENT_NOQUOTES, 'UTF-8') ?>) </a> <?php } ?> </div> @@ -60,9 +60,9 @@ invalidateHttpCache(); } ?> -<div id="notification" class="notification <?php echo $status; ?>"> - <span class="msg"><?php echo $msg; ?></span> - <a class="close" href=""><?php echo _i('close'); ?></a> +<div id="notification" class="notification <?= $status ?>"> + <span class="msg"><?= $msg ?></span> + <a class="close" href=""><?= _i('close') ?></a> </div> </body> |