Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static

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

index 6f9c1a4b063b74ea8d4fe47287182c4a23676d92..56118cc90e0401c0b283ed6a25ce9c6f69a3e187 100644 (file)
--- a/view/theme/frio/php/default.php
+++ b/view/theme/frio/php/default.php
@@ -17,10 +17,10 @@
  <html>
  <head>
         <title><?php if(x($page,'title')) echo $page['title'] ?></title>
-       <meta request="<?php echo $_REQUEST['pagename'] ?> ">
-       <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+       <meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?> ">
+       <script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
         <script>var frio="<?php echo "view/theme/frio"; ?>";</script>
-       <?php $baseurl = $a->get_baseurl(); ?>
+       <?php $baseurl = App::get_baseurl(); ?>
         <?php $frio = "view/theme/frio"; ?>
         <?php 
                 // Because we use minimal for modals the header and the included js stuff should be only loaded
@@ -73,16 +73,6 @@ else
                                                 "; if(x($page,'right_aside')) echo $page['right_aside']; echo"
                                         </aside>
  
-                                       <!-- The following paragraph can maybe deleted because we don't need it anymore -->
-                                       <div id=\"NavAside\" class=\"navmenu navmenu-default navmenu-fixed-left offcanvas hidden-lg hidden-md\">
-                                               <div class=\"nav-container\">
-                                                       <div class=\"list-group\">
-                                                               "; if(x($page,'aside')) echo $page['aside']; echo"
-                                                               "; if(x($page,'right_aside')) echo $page['right_aside']; echo"
-                                                       </div>
-                                               </div>
-                                       </div><!--/.sidebar-offcanvas-->
-
                                         <div class=\"col-lg-7 col-md-7 col-sm-12 col-xs-12\" id=\"content\">
                                                 <section class=\"sectiontop "; echo $a->argv[0]; echo "-content-wrapper\">";
                                                                 if(x($page,'content')) echo $page['content']; echo"