gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2018-04-06 09:29:09 +02:00
commit ba98736dfb
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -103,6 +103,11 @@
- add document list which can be exported as an archive - add document list which can be exported as an archive
- search results can be exported - search results can be exported
--------------------------------------------------------------------------------
Changes in version 5.1.8
--------------------------------------------------------------------------------
- fix javascript errors when an error page was shown
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.7 Changes in version 5.1.7
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

17
views/bootstrap/class.Bootstrap.php
View File

@ -1522,6 +1522,23 @@ $(document).ready(function() {
function exitError($pagetitle, $error, $noexit=false, $plain=false) { /* {{{ */ function exitError($pagetitle, $error, $noexit=false, $plain=false) { /* {{{ */
/* This is just a hack to prevent creation of js files in an error
* case, because they will contain this error page again. It would be much
* better, if there was extra error() function similar to show() and calling
* $view() after setting the action to 'error'. This would also allow to
* set separate error pages for each view.
*/
if(!$noexit) {
if(in_array($_REQUEST['action'], array('js', 'footerjs'))) {
exit;
}
if($_REQUEST['action'] == 'webrootjs') {
$this->webrootjs();
exit;
}
}
if(!$plain) { if(!$plain) {
$this->htmlStartPage($pagetitle); $this->htmlStartPage($pagetitle);
$this->globalNavigation(); $this->globalNavigation();