Merge branch 'release-10.0' into release-10.0-datetime-format

EreMaijala · Sep 4, 2024 · 2424a8c · 2424a8c
2 parents 59a5442 + 60aef1a
commit 2424a8c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/module/VuFind/src/VuFind/OAuth2/Entity/UserEntity.php b/module/VuFind/src/VuFind/OAuth2/Entity/UserEntity.php
@@ -82,7 +82,7 @@ public function __construct(
         }
         if ($userIdentifier === null) {
             throw new \VuFind\Exception\BadConfig(
-                "$userIdentifierField empty for user {$user->id}."
+                "$userIdentifierField empty for user {$user->getId()}."
                 . ' The configured user identifier field has to be required.'
             );
         }

diff --git a/module/VuFind/src/VuFind/Search/History.php b/module/VuFind/src/VuFind/Search/History.php
@@ -99,7 +99,7 @@ public function getSearchHistory($userId = null)
                 $unsaved[] = $search;
             }
             if ($search->getOptions()->supportsScheduledSearch()) {
-                $schedule[$search->getSearchId()] = $current->getNotificationFrequency();
+                $schedule[$current->getId()] = $current->getNotificationFrequency();
             }
         }
 

diff --git a/themes/bootstrap3/templates/myresearch/schedulesearch.phtml b/themes/bootstrap3/templates/myresearch/schedulesearch.phtml
@@ -12,9 +12,9 @@
 <?=$this->component('show-account-menu-button')?>
 
 <div class="<?=$this->layoutClass('mainbody')?>">
-  <?php if ($user && !empty($user->email)): ?>
+  <?php if ($user && !empty($user->getEmail())): ?>
     <div class="alert alert-info alert-email-notification">
-      <?=$this->transEsc('alert_email_address') . ': ' . $this->escapeHtml($user->email) ?>
+      <?=$this->transEsc('alert_email_address') . ': ' . $this->escapeHtml($user->getEmail()) ?>
       <?php if ($this->auth()->getManager()->supportsEmailChange()): ?>
         (<a href="<?=$this->url('myresearch-profile');?>"><?=$this->transEsc('edit');?></a>)
       <?php endif; ?>

diff --git a/themes/bootstrap3/templates/record/comments-list.phtml b/themes/bootstrap3/templates/record/comments-list.phtml
@@ -8,7 +8,7 @@
         <strong><?=null === $comment->getUser()->getId() ? $this->transEsc('comment_anonymous_user') : $this->escapeHtml(trim($comment->getUser()->getFirstName() . ' ' . $comment->getUser()->getLastName()))?></strong><br>
         <small>
           <?=$this->escapeHtml($comment->getCreated()->format($this->config()->dateTimeFormat()))?>
-          <?php if (($user = $this->auth()->getUserObject()) && $comment->getUser()->getId() == $user->id): ?>
+          <?php if (($user = $this->auth()->getUserObject()) && $comment->getUser()->getId() == $user->getId()): ?>
             <a href="<?=$this->escapeHtmlAttr($this->recordLinker()->getActionUrl($this->driver, 'DeleteComment', ['delete' => $comment->getId()]))?>" id="recordComment<?=$this->escapeHtml($comment->getId())?>" class="delete"><?=$this->transEsc('Delete')?></a>
           <?php endif; ?>
         </small>

diff --git a/themes/bootstrap5/templates/myresearch/schedulesearch.phtml b/themes/bootstrap5/templates/myresearch/schedulesearch.phtml
@@ -12,9 +12,9 @@
 <?=$this->component('show-account-menu-button')?>
 
 <div class="<?=$this->layoutClass('mainbody')?>">
-  <?php if ($user && !empty($user->email)): ?>
+  <?php if ($user && !empty($user->getEmail())): ?>
     <div class="alert alert-info alert-email-notification">
-      <?=$this->transEsc('alert_email_address') . ': ' . $this->escapeHtml($user->email) ?>
+      <?=$this->transEsc('alert_email_address') . ': ' . $this->escapeHtml($user->getEmail()) ?>
       <?php if ($this->auth()->getManager()->supportsEmailChange()): ?>
         (<a href="<?=$this->url('myresearch-profile');?>"><?=$this->transEsc('edit');?></a>)
       <?php endif; ?>

diff --git a/themes/bootstrap5/templates/record/comments-list.phtml b/themes/bootstrap5/templates/record/comments-list.phtml
@@ -8,7 +8,7 @@
         <strong><?=null === $comment->getUser()->getId() ? $this->transEsc('comment_anonymous_user') : $this->escapeHtml(trim($comment->getUser()->getFirstName() . ' ' . $comment->getUser()->getLastName()))?></strong><br>
         <small>
           <?=$this->escapeHtml($comment->getCreated()->format($this->config()->dateTimeFormat()))?>
-          <?php if (($user = $this->auth()->getUserObject()) && $comment->getUser()->getId() == $user->id): ?>
+          <?php if (($user = $this->auth()->getUserObject()) && $comment->getUser()->getId() == $user->getId()): ?>
             <a href="<?=$this->escapeHtmlAttr($this->recordLinker()->getActionUrl($this->driver, 'DeleteComment', ['delete' => $comment->getId()]))?>" id="recordComment<?=$this->escapeHtml($comment->getId())?>" class="delete"><?=$this->transEsc('Delete')?></a>
           <?php endif; ?>
         </small>