Merge remote-tracking branch 'upstream/develop' into aria

[friendica.git] / view / theme / frio / php / standard.php
diff --git a/view/theme/frio/php/standard.php b/view/theme/frio/php/standard.php

index f0ad898752e90b1ad826cfa51839f7b57a03f658..7698f0aaab179b19d015386a3fc23d12995b2bc9 100644 (file)
--- a/view/theme/frio/php/standard.php
+++ b/view/theme/frio/php/standard.php
@@ -7,20 +7,20 @@
  <!DOCTYPE html >
  <html>
  <head>
-       <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+       <title><?php if(!empty($page['title'])) echo $page['title'] ?></title>
         <meta name="viewport" content="initial-scale=1.0">
         <meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
         <script type="text/javascript">var baseurl="<?php echo Friendica\Core\System::baseUrl() ?>";</script>
         <script type="text/javascript">var frio="<?php echo "view/theme/frio"; ?>";</script>
         <?php $baseurl = Friendica\Core\System::baseUrl(); ?>
         <?php $frio = "view/theme/frio"; ?>
-       <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
+       <?php if(!empty($page['htmlhead'])) echo $page['htmlhead']; ?>
  </head>
-<body id=\"top\">";
+<body id="top">
  <?php if($_SERVER['REQUEST_URI'] == "/"){header('Location: /login');} ?>
  <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
  <?php
-       if(x($page,'nav')) {
+       if(!empty($page['nav'])) {
         echo    str_replace("~config.sitename~",Friendica\Core\Config::get('config','sitename'),
                         str_replace("~system.banner~",Friendica\Core\Config::get('system','banner'),
                         $page['nav']
@@ -33,8 +33,8 @@
  <?php
                                         echo"
                                         <aside class=\"col-lg-3 col-md-3 hidden-sm hidden-xs\">
-                                               "; if(x($page,'aside')) echo $page['aside']; echo"
-                                               "; if(x($page,'right_aside')) echo $page['right_aside']; echo"
+                                               "; if(!empty($page['aside'])) echo $page['aside']; echo"
+                                               "; if(!empty($page['right_aside'])) echo $page['right_aside']; echo"
                                                 "; include('includes/photo_side.php'); echo"
                                         </aside>
  
@@ -42,7 +42,7 @@
                                                 <section class=\"sectiontop\">
                                                                 <div class=\"panel "; echo $a->argv[0]; echo "-content-wrapper\">
                                                                         <div class=\"panel-body\">";
-                                                                               if(x($page,'content')) echo $page['content']; echo"
+                                                                               if(!empty($page['content'])) echo $page['content']; echo"
                                                                                 <div id=\"pause\"></div> <!-- The pause/resume Ajax indicator -->
                                                                         </div>
                                                                 </div>