andy/neoCMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 11 Wiki Activity

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

Browse Source 
# Conflicts:
#	cms/js/neocms.js
#	cms/settings/index.php
This commit is contained in:
Andy Dixon
2024-08-01 21:15:41 +01:00
parent 49e914bb6e bd1567b788
commit c287e9de30
29 changed files with 16 additions and 6683 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cms/functions/restore.php
+1 -1
View File
@@ -154,7 +154,7 @@ if (isset($_SESSION['neoCMSSess']) && strstr($_SESSION['neoCMSSess'], 'neoCMSses
$restdoc = fopen($url, "w");
fputs($restdoc, $backcontent);
fclose($restdoc);
} else $message = "<strong>Error:</strong> You do not have permission to edit this page. Try <a href='settings/ftpinfo.php' title='Enter your FTP info'>saving your FTP info here</a>.";
} else $message = "<strong>Error:</strong> You do not have permission to edit this page.";
}
cms/functions/save.php
+1 -1
View File
@@ -500,7 +500,7 @@ if (isset($_SESSION['neoCMSSess']) && strstr($_SESSION['neoCMSSess'], 'neoCMSses
fwrite($doc, $fpost);
fclose($doc);
} else $message = "<strong>Error:</strong> You do not have permission to edit this page. Try <a href='settings/ftpinfo.php' title='Enter your FTP info'>saving your FTP info here</a>.";
} else $message = "<strong>Error:</strong> You do not have permission to edit this page.";
} else $message = '<strong>Error:</strong> neocms is unable find this page.';