gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-11 09:35:00 +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 2017-03-06 10:52:36 +01:00
commit 132f146a9f
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -114,6 +114,8 @@
--------------------------------------------------------------------------------
- add multibyte save basename() replacement, which fixes uploading files whose
name starts with a multibyte char
- show both number of links from a document A to B and vise versa in tab header
on ViewDocuments page
--------------------------------------------------------------------------------
Changes in version 4.3.33

9
utils/xmldump.php
View File

@ -1,6 +1,11 @@
<?php
require_once("../inc/inc.ClassSettings.php");
require_once("../inc/inc.ClassAcl.php");
if(isset($_SERVER['SEEDDMS_HOME'])) {
require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassSettings.php");
require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassAcl.php");
} else {
require_once("../inc/inc.ClassSettings.php");
require_once("../inc/inc.ClassAcl.php");
}
function usage() { /* {{{ */
echo "Usage:\n";

9
utils/xmlimport.php
View File

@ -1,6 +1,11 @@
<?php
require_once("../inc/inc.ClassSettings.php");
require_once("../inc/inc.ClassAcl.php");
if(isset($_SERVER['SEEDDMS_HOME'])) {
require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassSettings.php");
require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassAcl.php");
} else {
require_once("../inc/inc.ClassSettings.php");
require_once("../inc/inc.ClassAcl.php");
}
require("Log.php");
function usage() { /* {{{ */

2
views/bootstrap/class.ViewDocument.php
View File

@ -509,7 +509,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
}
?>
<li class="<?php if($currenttab == 'attachments') echo 'active'; ?>"><a data-target="#attachments" data-toggle="tab"><?php printMLText('linked_files'); echo (count($files)) ? " (".count($files).")" : ""; ?></a></li>
<li class="<?php if($currenttab == 'links') echo 'active'; ?>"><a data-target="#links" data-toggle="tab"><?php printMLText('linked_documents'); echo (count($links)) ? " (".count($links).")" : ""; ?></a></li>
<li class="<?php if($currenttab == 'links') echo 'active'; ?>"><a data-target="#links" data-toggle="tab"><?php printMLText('linked_documents'); echo (count($links) || count($reverselinks)) ? " (".count($links)."/".count($reverselinks).")" : ""; ?></a></li>
</ul>
<div class="tab-content">
<div class="tab-pane <?php if(!$currenttab || $currenttab == 'docinfo') echo 'active'; ?>" id="docinfo">