diff options
| author |  Tom Willemse | 2024-06-11 00:13:48 -0700 |
|---|---|---|
| committer | Tom Willemse | 2024-06-11 00:13:48 -0700 |
| commit | a959a69a1dd781caa33829db161859c88455911d (patch) | |
| tree | ac0db2fa23482c6ef5caedd21079bf2f8c9be368 /data/templates/sscuttlizr | |
| parent | 9bcc5827388491d37591a86a175f63fa9cd38d41 (diff) | |
| parent | 85cca718e308779a56dbf302140ce9088fc0727a (diff) | |
| download | scuttle-a959a69a1dd781caa33829db161859c88455911d.tar.gz scuttle-a959a69a1dd781caa33829db161859c88455911d.zip | |
Merge branch 'sqlite-fixes' into oni
Diffstat (limited to 'data/templates/sscuttlizr')
4 files changed, 16 insertions, 6 deletions
diff --git a/data/templates/sscuttlizr/bookmarkcommondescriptionedit.tpl.php b/data/templates/sscuttlizr/bookmarkcommondescriptionedit.tpl.php index b1114d7..4629d72 100644 --- a/data/templates/sscuttlizr/bookmarkcommondescriptionedit.tpl.php +++ b/data/templates/sscuttlizr/bookmarkcommondescriptionedit.tpl.php @@ -33,8 +33,13 @@ window.onload = function() { if(strlen($description['cdDatetime'])>0) { echo T_('Last modification:').' '.$description['cdDatetime'].', '; $lastUser = $userservice->getUser($description['uId']); - echo '<a href="'.createURL('profile', $lastUser['username']).'">' - . SemanticScuttle_Model_UserArray::getName($lastUser) . '</a>'; + if ($lastUser) { + echo '<a href="'.createURL('profile', $lastUser['username']).'">' + . SemanticScuttle_Model_UserArray::getName($lastUser) . '</a>'; + } + else { + echo 'Unknown user'; + } } ?> </td> diff --git a/data/templates/sscuttlizr/bookmarks.tpl.php b/data/templates/sscuttlizr/bookmarks.tpl.php index 2df30db..c87a337 100644 --- a/data/templates/sscuttlizr/bookmarks.tpl.php +++ b/data/templates/sscuttlizr/bookmarks.tpl.php @@ -87,7 +87,7 @@ if ($userservice->isLoggedOn()) { /* personal tag description */ if($currenttag!= '' && $user!='') { $userObject = $userservice->getUserByUsername($user); - if($tagservice->getDescription($currenttag, $userObject['uId'])) { ?> + if($userObject && $tagservice->getDescription($currenttag, $userObject['uId'])) { ?> <p class="commondescription"><?php $pDescription = $tagservice->getDescription($currenttag, $userObject['uId']); diff --git a/data/templates/sscuttlizr/sidebar.block.menu.php b/data/templates/sscuttlizr/sidebar.block.menu.php index 94a9fa2..dfb2c25 100644 --- a/data/templates/sscuttlizr/sidebar.block.menu.php +++ b/data/templates/sscuttlizr/sidebar.block.menu.php @@ -63,7 +63,7 @@ if (sizeof($menuTags) > 0 || ($userid != 0 && $userid === $logged_on_userid)) { </table> <?php $cUser = $userservice->getUser($userid); ?> -<?php if($userid>0): ?> +<?php if($cUser && $userid>0): ?> <?php if($userid==$logged_on_userid): ?> <p style="text-align:right"><a href="<?php echo createURL('alltags', $cUser['username']); ?>" title="<?php echo T_('See all your tags')?>"><?php echo T_('all your tags'); ?></a> →</p> <?php else: ?> diff --git a/data/templates/sscuttlizr/tagcommondescriptionedit.tpl.php b/data/templates/sscuttlizr/tagcommondescriptionedit.tpl.php index e46c184..bde2ff8 100644 --- a/data/templates/sscuttlizr/tagcommondescriptionedit.tpl.php +++ b/data/templates/sscuttlizr/tagcommondescriptionedit.tpl.php @@ -24,8 +24,13 @@ window.onload = function() { if(strlen($description['cdDatetime'])>0) { echo T_('Last modification:').' '.$description['cdDatetime'].', '; $lastUser = $userservice->getUser($description['uId']); - echo '<a href="' . createURL('profile', $lastUser['username']) . '">' - . SemanticScuttle_Model_UserArray::getName($lastUser) . '</a>'; + if ($lastUser) { + echo '<a href="' . createURL('profile', $lastUser['username']) . '">' + . SemanticScuttle_Model_UserArray::getName($lastUser) . '</a>'; + } + else { + echo 'Unknown user'; + } } ?> </td> |