aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Controller
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-12-29 10:54:07 +0100
committerGitHub <noreply@github.com>2016-12-29 10:54:07 +0100
commit8527238846b0ea307ba68ca8a831eb0884c68d4a (patch)
treef93d54cd9fcbb85fa43c989ef670612f9a4d47e5 /src/Wallabag/CoreBundle/Controller
parent90f6ee4dbe761f97edf0bf87ffeb1f75acec6c25 (diff)
parent7239082a5e290dada1d393f7a25acebb09ace2de (diff)
downloadwallabag-8527238846b0ea307ba68ca8a831eb0884c68d4a.tar.gz
wallabag-8527238846b0ea307ba68ca8a831eb0884c68d4a.tar.zst
wallabag-8527238846b0ea307ba68ca8a831eb0884c68d4a.zip
Merge pull request #2702 from wallabag/add-index-uuid
Added index on entry.uuid
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
-rw-r--r--src/Wallabag/CoreBundle/Controller/EntryController.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index b03f49ed..f7398e69 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -539,8 +539,8 @@ class EntryController extends Controller
539 { 539 {
540 $this->checkUserAction($entry); 540 $this->checkUserAction($entry);
541 541
542 if (null === $entry->getUuid()) { 542 if (null === $entry->getUid()) {
543 $entry->generateUuid(); 543 $entry->generateUid();
544 544
545 $em = $this->getDoctrine()->getManager(); 545 $em = $this->getDoctrine()->getManager();
546 $em->persist($entry); 546 $em->persist($entry);
@@ -548,7 +548,7 @@ class EntryController extends Controller
548 } 548 }
549 549
550 return $this->redirect($this->generateUrl('share_entry', [ 550 return $this->redirect($this->generateUrl('share_entry', [
551 'uuid' => $entry->getUuid(), 551 'uid' => $entry->getUid(),
552 ])); 552 ]));
553 } 553 }
554 554
@@ -565,7 +565,7 @@ class EntryController extends Controller
565 { 565 {
566 $this->checkUserAction($entry); 566 $this->checkUserAction($entry);
567 567
568 $entry->cleanUuid(); 568 $entry->cleanUid();
569 569
570 $em = $this->getDoctrine()->getManager(); 570 $em = $this->getDoctrine()->getManager();
571 $em->persist($entry); 571 $em->persist($entry);
@@ -581,7 +581,7 @@ class EntryController extends Controller
581 * 581 *
582 * @param Entry $entry 582 * @param Entry $entry
583 * 583 *
584 * @Route("/share/{uuid}", requirements={"uuid" = ".+"}, name="share_entry") 584 * @Route("/share/{uid}", requirements={"uid" = ".+"}, name="share_entry")
585 * @Cache(maxage="25200", smaxage="25200", public=true) 585 * @Cache(maxage="25200", smaxage="25200", public=true)
586 * 586 *
587 * @return \Symfony\Component\HttpFoundation\Response 587 * @return \Symfony\Component\HttpFoundation\Response