gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-10-31 13:18:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.0.x' into develop

Browse Source
This commit is contained in:
Uwe Steinmann 2015-10-27 11:43:40 +01:00
commit f78e02e7e8
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1887,7 +1887,7 @@ class SeedDMS_Core_DMS {
*/
function createPasswordRequest($user) { /* {{{ */
$hash = md5(uniqid(time()));
$queryStr = "INSERT INTO tblUserPasswordRequest (userID, hash, `date`) VALUES (" . $user->getId() . ", " . $this->db->qstr($hash) .", ".$db->getCurrentDatetime().")";
$queryStr = "INSERT INTO tblUserPasswordRequest (userID, hash, `date`) VALUES (" . $user->getId() . ", " . $this->db->qstr($hash) .", ".$this->db->getCurrentDatetime().")";
$resArr = $this->db->getResult($queryStr);
if (is_bool($resArr) && !$resArr) return false;
return $hash;

4
styles/bootstrap/application.css
View File

@ -53,6 +53,10 @@ ul.jqtree-tree li.jqtree-selected > .jqtree-element:hover {
font-weight: bold;
}
.wordbreak {
word-break: break-word;
}
.btn-file {
position: relative;
overflow: hidden;

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

@ -456,7 +456,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
print "</td>\n";
print "<td><ul class=\"actions unstyled\">\n";
// print "<li>".$latestContent->getOriginalFileName() ."</li>\n";
// print "<li class=\"wordbreak\">".$latestContent->getOriginalFileName() ."</li>\n";
print "<li>".getMLText('version').": ".$latestContent->getVersion()."</li>\n";
if ($file_exists)