gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-12 20:51:30 +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-03 12:08:05 +01:00
commit 0a8261fdcb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
op/op.Ajax.php
View File

@ -652,7 +652,7 @@ switch($command) {
if (!empty($_POST["name"])) if (!empty($_POST["name"]))
$name = $_POST["name"]; $name = $_POST["name"];
else else
$name = basename($userfilename); $name = utf8_basename($userfilename);
/* Check if name already exists in the folder */ /* Check if name already exists in the folder */
if(!$settings->_enableDuplicateDocNames) { if(!$settings->_enableDuplicateDocNames) {
@ -721,7 +721,7 @@ switch($command) {
$filesize = SeedDMS_Core_File::fileSize($userfiletmp); $filesize = SeedDMS_Core_File::fileSize($userfiletmp);
$res = $folder->addDocument($name, '', $expires, $user, '', $res = $folder->addDocument($name, '', $expires, $user, '',
array(), $userfiletmp, basename($userfilename), array(), $userfiletmp, utf8_basename($userfilename),
$fileType, $userfiletype, 0, $fileType, $userfiletype, 0,
$reviewers, $approvers, 1, $reviewers, $approvers, 1,
'', array(), array(), $workflow); '', array(), array(), $workflow);
@ -756,7 +756,7 @@ switch($command) {
if(isset($GLOBALS['SEEDDMS_HOOKS']['addDocument'])) { if(isset($GLOBALS['SEEDDMS_HOOKS']['addDocument'])) {
foreach($GLOBALS['SEEDDMS_HOOKS']['addDocument'] as $hookObj) { foreach($GLOBALS['SEEDDMS_HOOKS']['addDocument'] as $hookObj) {
if (method_exists($hookObj, 'preIndexDocument')) { if (method_exists($hookObj, 'preIndexDocument')) {
$hookObj->preIndexDocument($document, $idoc); $hookObj->preIndexDocument(null, $document, $idoc);
} }
} }
} }