Julio Montoya před 13 roky
rodič
revize
78b2eb1173
2 změnil soubory, kde provedl 26 přidání a 16 odebrání
  1. 17 15
      main/inc/lib/banner.lib.php
  2. 9 1
      main/inc/lib/main_api.lib.php

+ 17 - 15
main/inc/lib/banner.lib.php

@@ -336,22 +336,24 @@ function show_header_3() {
                 $menu_navigation['platform_admin'] = $possible_tabs['platform_admin'];
             }
         }
-				// Reports
-				if (api_get_setting('show_tabs', 'reports') == 'true') {
-					if ((api_is_platform_admin() || api_is_drh() || api_is_session_admin()) && Rights::hasRight('show_tabs:reports')) {
-						$navigation['reports'] = $possible_tabs['reports'];
-					}
-				} else{
-					$menu_navigation['reports'] = $possible_tabs['reports'];
-				}
+		// Reports
+		if (api_get_setting('show_tabs', 'reports') == 'true') {
+			if ((api_is_platform_admin() || api_is_drh() || api_is_session_admin()) && Rights::hasRight('show_tabs:reports')) {
+				$navigation['reports'] = $possible_tabs['reports'];
+			}
+		} else{
+			$menu_navigation['reports'] = $possible_tabs['reports'];
+		}
 
-				// Custom tabs
-				for ($i=1;$i<=3;$i++)
-					if (api_get_setting('show_tabs', 'custom_tab_'.$i) == 'true') {
-						$navigation['custom_tab_'.$i] = $possible_tabs['custom_tab_'.$i];
-					} else{
-						$menu_navigation['custom_tab_'.$i] = $possible_tabs['custom_tab_'.$i];
-					}
+		// Custom tabs
+		for ($i=1;$i<=3;$i++)
+			if (api_get_setting('show_tabs', 'custom_tab_'.$i) == 'true') {
+				$navigation['custom_tab_'.$i] = $possible_tabs['custom_tab_'.$i];
+			} else {
+			    if (isset($possible_tabs['custom_tab_'.$i])) {
+                    $menu_navigation['custom_tab_'.$i] = $possible_tabs['custom_tab_'.$i];
+                }
+			}
     }
     
     // Displaying the tabs

+ 9 - 1
main/inc/lib/main_api.lib.php

@@ -1831,7 +1831,15 @@ function api_get_setting($variable, $key = null) {
             return '';
         }
     }
-    return is_null($key) ? ((isset($_setting[$variable]) && $_setting[$variable] != '') ? $_setting[$variable] : null) : $_setting[$variable][$key];
+    $value = null;
+    if (is_null($key)) {
+        $value = ((isset($_setting[$variable]) && $_setting[$variable] != '') ? $_setting[$variable] : null);         
+    } else {
+        if (isset($_setting[$variable][$key])) {
+            $value = $_setting[$variable][$key];
+        }
+    }
+    return $value;
 }
 
 /**