Merge branch 'seeddms-4.1.1' into develop

This commit is contained in:
Uwe Steinmann 2013-04-05 13:24:21 +02:00
commit 93b525cf3f

View File

@ -136,7 +136,7 @@ if(($oldcomment = $folder->getComment()) != $comment) {
$params['old_comment'] = $oldcomment;
$params['comment'] = $dcomment;
$params['username'] = $user->getFullName();
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->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['http_root'] = $settings->_httpRoot;
$notifier->toList($user, $notifyList["users"], $subject, $message, $params);