Merge branch 'master' into ai_server

Author: connortechnology

web/skins/classic/includes/functions.php

@@ -592,8 +592,6 @@ function buildSidebarMenu() {
               </a>
             </li>
 ';
-  } else if (defined('ZM_SIDEBAR_FOOTER') and ZM_SIDEBAR_FOOTER) {
-    $menu .= ZM_SIDEBAR_FOOTER;
   }
   $menu .= '
           </ul>

web/skins/classic/views/options.php

@@ -37,6 +37,9 @@
 <?php echo getPageHeaderHTML() ?>
   <div class="container-fluid" id="content">
     <div class="row flex-nowrap h-100">
+<?php
+if (!(defined('ZM_WEB_LEFT_MENU_OPTIONS_SUBMENU') and ZM_WEB_LEFT_MENU_OPTIONS_SUBMENU)) {
+?>
       <nav id="sidebar">
         <ul class="nav nav-pills flex-column">
 <?php
@@ -46,6 +49,7 @@
 ?>
         </ul>
       </nav>
+<?php } ?>
       <div id="optionsContainer">
 <?php 
 if ($tab == 'display') {