Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # cms/js/neocms.js # cms/settings/index.php
2024-08-01 21:15:41 +01:00
parent 49e914bb6e bd1567b788
commit c287e9de30
29 changed files with 16 additions and 6683 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)