gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 13:42:04 +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 2022-10-10 14:04:19 +02:00
commit 5278732456
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -239,6 +239,9 @@
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.28 Changes in version 5.1.28
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
- user information in user manager failed to load when a document content
with 0 bytes was created by the user
- fix repair of wrong file extension
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.27 Changes in version 5.1.27

2
SeedDMS_Core/Core/inc.ClassUser.php
View File

@ -1736,7 +1736,7 @@ class SeedDMS_Core_User { /* {{{ */
foreach ($resArr as $row) { foreach ($resArr as $row) {
$document = $this->_dms->getDocument($row["document"]); $document = $this->_dms->getDocument($row["document"]);
/** @var SeedDMS_Core_DocumentContent $content */ /** @var SeedDMS_Core_DocumentContent $content */
$content = new $classname((int) $row["id"], $this, $row["version"], $row["comment"], $row["date"], $row["createdBy"], $row["dir"], $row["orgFileName"], $row["fileType"], $row["mimeType"], $row['fileSize'], $row['checksum']); $content = new $classname((int) $row["id"], $document, $row["version"], $row["comment"], $row["date"], $row["createdBy"], $row["dir"], $row["orgFileName"], $row["fileType"], $row["mimeType"], $row['fileSize'], $row['checksum']);
$contents[] = $content; $contents[] = $content;
} }
return $contents; return $contents;

2
SeedDMS_Core/Core/inc.FileUtils.php
View File

@ -137,7 +137,7 @@ class SeedDMS_Core_File {
case "image/png": case "image/png":
case "image/gif": case "image/gif":
case "image/jpg": case "image/jpg":
$expect = substr($this->_mimeType, -3, 3); $expect = substr($mimetype, -3, 3);
break; break;
default: default:
$mime_map = [ $mime_map = [

10
SeedDMS_Core/package.xml
View File

@ -12,11 +12,11 @@
<email>uwe@steinmann.cx</email> <email>uwe@steinmann.cx</email>
<active>yes</active> <active>yes</active>
</lead> </lead>
<date>2022-09-18</date> <date>2022-10-10</date>
<time>13:44:55</time> <time>13:44:55</time>
<version> <version>
<release>6.0.20</release> <release>6.0.21</release>
<api>6.0.20</api> <api>6.0.21</api>
</version> </version>
<stability> <stability>
<release>stable</release> <release>stable</release>
@ -24,8 +24,8 @@
</stability> </stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license> <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes> <notes>
- all changes from 5.1.27 merged - fix SeedDMS_Core_User::getDocumentContents()
- SeedDMЅ_Core_DMS::getDocumentsInRevision() returns status from revision log - fix SeedDMS_Core_File::fileExtension()
</notes> </notes>
<contents> <contents>
<dir baseinstalldir="SeedDMS" name="/"> <dir baseinstalldir="SeedDMS" name="/">