Merge branch 'master' into dev

2024-07-23 19:03:59 +01:00
parent 3e09519f5f 581601bcb5
commit bd1567b788
29 changed files with 24 additions and 6691 deletions
@@ -51,9 +51,7 @@ getGlobals = function (path, html, files, filePath, exFolders, imagePath) {
    neoCMSFilePath = filePath;
    neoCMSImagePath = imagePath;
    neoCMSExFolders = exFolders;
-    $('#neoCMSPrefsFrame').load('core/getpath.php', function () {
-        $('#neoCMSPrefsFrame').remove()
-    });
+    $('#neoCMSPrefsFrame').remove(); // Is this needed?
    initPage();
    setTimeout(function () {
        $('#neoCMSPageSrc').bind('load', initPage)