gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-15 22:21:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

check for null passed as folder to getFolderList()

Browse Source
This commit is contained in:
Uwe Steinmann 2021-07-14 12:00:47 +02:00
parent 59d9786a4c
commit ca9e1c8860
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
views/bootstrap/class.Bootstrap.php
View File

@ -2925,6 +2925,8 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
* @return string * @return string
*/ */
function getListRowPath($object) { /* {{{ */ function getListRowPath($object) { /* {{{ */
if(!$object)
return '';
$belowtitle = ''; $belowtitle = '';
$folder = $object->getParent(); $folder = $object->getParent();
if($folder) { if($folder) {
@ -3187,6 +3189,9 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
$accessop = $this->params['accessobject']; $accessop = $this->params['accessobject'];
$onepage = $this->params['onepage']; $onepage = $this->params['onepage'];
if(!$subFolder)
return '';
$owner = $subFolder->getOwner(); $owner = $subFolder->getOwner();
$comment = $subFolder->getComment(); $comment = $subFolder->getComment();
if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";

5
views/bootstrap4/class.Bootstrap4.php
View File

@ -2908,6 +2908,8 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
* @return string * @return string
*/ */
function getListRowPath($object) { /* {{{ */ function getListRowPath($object) { /* {{{ */
if(!$object)
return '';
$belowtitle = ''; $belowtitle = '';
$folder = $object->getParent(); $folder = $object->getParent();
if($folder) { if($folder) {
@ -3176,6 +3178,9 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
$accessop = $this->params['accessobject']; $accessop = $this->params['accessobject'];
$onepage = $this->params['onepage']; $onepage = $this->params['onepage'];
if(!$subFolder)
return '';
$owner = $subFolder->getOwner(); $owner = $subFolder->getOwner();
$comment = $subFolder->getComment(); $comment = $subFolder->getComment();
if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";