gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 08:55:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.1.3' into develop

Browse Source
This commit is contained in:
Uwe Steinmann 2013-04-08 08:52:53 +02:00
commit abf12413da
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/inc.Utils.php
View File

@ -326,7 +326,7 @@ function _add_log_line($msg="") { /* {{{ */
function filterDocumentLinks($user, $links) { /* {{{ */ function filterDocumentLinks($user, $links) { /* {{{ */
$tmp = array(); $tmp = array();
foreach ($links as $link) foreach ($links as $link)
if ($link->isPublic() || ($link->_userID == $user->getID()) || $user->isAdmin()) if ($link->isPublic() || ($link->getUser()->getID == $user->getID()) || $user->isAdmin())
array_push($tmp, $link); array_push($tmp, $link);
return $tmp; return $tmp;
} /* }}} */ } /* }}} */

2
op/op.EditFolder.php
View File

@ -134,7 +134,7 @@ if(($oldcomment = $folder->getComment()) != $comment) {
$params['name'] = $folder->getName(); $params['name'] = $folder->getName();
$params['folder_path'] = $folder->getFolderPathPlain(); $params['folder_path'] = $folder->getFolderPathPlain();
$params['old_comment'] = $oldcomment; $params['old_comment'] = $oldcomment;
$params['comment'] = $dcomment; $params['comment'] = $comment;
$params['username'] = $user->getFullName(); $params['username'] = $user->getFullName();
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(); $params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
$params['sitename'] = $settings->_siteName; $params['sitename'] = $settings->_siteName;