Przeglądaj źródła

possible fix for some users on install wizard

causefx 7 lat temu
rodzic
commit
836b4c61c5

+ 1 - 1
api/functions/config-functions.php

@@ -85,7 +85,7 @@ function configLazy()
 	if (file_exists($GLOBALS['userConfigPath'])) {
 	if (file_exists($GLOBALS['userConfigPath'])) {
 		$config = fillDefaultConfig(loadConfig($GLOBALS['userConfigPath']));
 		$config = fillDefaultConfig(loadConfig($GLOBALS['userConfigPath']));
 	} else {
 	} else {
-		$config = loadConfig($GLOBALS['defaultConfigPath']);
+		$config = fillDefaultConfig(loadConfig($GLOBALS['defaultConfigPath']));
 	}
 	}
 	if (is_array($config)) {
 	if (is_array($config)) {
 		defineConfig($config);
 		defineConfig($config);

+ 1 - 1
api/functions/organizr-functions.php

@@ -83,7 +83,7 @@ function organizrSpecialSettings()
 			'minimalLoginScreen' => $GLOBALS['minimalLoginScreen'],
 			'minimalLoginScreen' => $GLOBALS['minimalLoginScreen'],
 			'unsortedTabs' => $GLOBALS['unsortedTabs'],
 			'unsortedTabs' => $GLOBALS['unsortedTabs'],
 			'authBackend' => $GLOBALS['authBackend'],
 			'authBackend' => $GLOBALS['authBackend'],
-			'newMessageSound' => $GLOBALS['CHAT-newMessageSound-include'],
+			'newMessageSound' => (isset($GLOBALS['CHAT-newMessageSound-include'])) ? $GLOBALS['CHAT-newMessageSound-include'] : '',
 			'uuid' => $GLOBALS['uuid'],
 			'uuid' => $GLOBALS['uuid'],
 		)
 		)
 	);
 	);

+ 7 - 0
css/organizr.css

@@ -1200,4 +1200,11 @@ html {
     max-height: 568px;
     max-height: 568px;
     min-height: 568px;
     min-height: 568px;
 }
 }
+.internal-listing {
+    min-height: inherit;
+    max-height: inherit;
+}
+.internal-listing .simplebar-track.horizontal {
+    display: none;
+}
 */
 */

+ 1 - 0
js/custom.js

@@ -4,6 +4,7 @@ var idleTime = 0;
 var hasCookie = false;
 var hasCookie = false;
 $(document).ajaxComplete(function () {
 $(document).ajaxComplete(function () {
     pageLoad();
     pageLoad();
+    //new SimpleBar($('.internal-listing')[0]);
 });
 });
 $(document).ready(function () {
 $(document).ready(function () {
     pageLoad();
     pageLoad();

Plik diff jest za duży
+ 3 - 3
js/simplebar.js


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików