Commit c1aad1f7 authored by mabolek's avatar mabolek Committed by Thomas Löffler
Browse files

[FIX] Mixup between immutable and mutable in function calls and variables

parent 4b30c6fd
...@@ -83,11 +83,7 @@ class KarmaService implements \TYPO3\CMS\Core\SingletonInterface ...@@ -83,11 +83,7 @@ class KarmaService implements \TYPO3\CMS\Core\SingletonInterface
$mutableKarma = $this->getMutableKarmaForUser($frontendUser, true, false); $mutableKarma = $this->getMutableKarmaForUser($frontendUser, true, false);
$frontendUser->setKarmaImmutableValueCache($immutableKarma); $frontendUser->setKarmaImmutableValueCache($immutableKarma);
<<<<<<< HEAD:extensions/karma/Classes/Service/KarmaService.php
$frontendUser->setKarmaMutableValueCache($mutableKarma); $frontendUser->setKarmaMutableValueCache($mutableKarma);
=======
$frontendUser->setKarmaImmutableValueCache($immutableKarma);
>>>>>>> [TASK] It is possible to add karma to a user and cache it:html/typo3conf/ext/karma/Classes/Service/KarmaService.php
$frontendUser->setKarmaCacheTimestamp(time()); $frontendUser->setKarmaCacheTimestamp(time());
$this->frontendUserRepository->update($frontendUser); $this->frontendUserRepository->update($frontendUser);
...@@ -118,11 +114,7 @@ class KarmaService implements \TYPO3\CMS\Core\SingletonInterface ...@@ -118,11 +114,7 @@ class KarmaService implements \TYPO3\CMS\Core\SingletonInterface
$immutableKarma = $this->getImmutableKarmaForUser($frontendUser, true, false); $immutableKarma = $this->getImmutableKarmaForUser($frontendUser, true, false);
$frontendUser->setKarmaMutableValueCache($mutableKarma); $frontendUser->setKarmaMutableValueCache($mutableKarma);
<<<<<<< HEAD:extensions/karma/Classes/Service/KarmaService.php
$frontendUser->setKarmaImmutableValueCache($immutableKarma); $frontendUser->setKarmaImmutableValueCache($immutableKarma);
=======
$frontendUser->setKarmaMutableValueCache($mutableKarma);
>>>>>>> [TASK] It is possible to add karma to a user and cache it:html/typo3conf/ext/karma/Classes/Service/KarmaService.php
$frontendUser->setKarmaCacheTimestamp(time()); $frontendUser->setKarmaCacheTimestamp(time());
$this->frontendUserRepository->update($frontendUser); $this->frontendUserRepository->update($frontendUser);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment