Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

This commit is contained in:
Uwe Steinmann 2017-02-11 16:33:48 +01:00
commit eae27d0646

View File

@ -196,7 +196,7 @@ class SeedDMS_Core_User { /* {{{ */
$db = $dms->getDB(); $db = $dms->getDB();
if($orderby == 'fullname') if($orderby == 'fullname')
$queryStr = "SELECT * FROM `tblUsers` ORDER BY `fullname`"; $queryStr = "SELECT * FROM `tblUsers` ORDER BY `fullName`";
else else
$queryStr = "SELECT * FROM `tblUsers` ORDER BY `login`"; $queryStr = "SELECT * FROM `tblUsers` ORDER BY `login`";
$resArr = $db->getResultArray($queryStr); $resArr = $db->getResultArray($queryStr);
@ -240,7 +240,7 @@ class SeedDMS_Core_User { /* {{{ */
function setFullName($newFullName) { /* {{{ */ function setFullName($newFullName) { /* {{{ */
$db = $this->_dms->getDB(); $db = $this->_dms->getDB();
$queryStr = "UPDATE `tblUsers` SET `fullname` = ".$db->qstr($newFullName)." WHERE `id` = " . $this->_id; $queryStr = "UPDATE `tblUsers` SET `fullName` = ".$db->qstr($newFullName)." WHERE `id` = " . $this->_id;
$res = $db->getResult($queryStr); $res = $db->getResult($queryStr);
if (!$res) if (!$res)
return false; return false;