aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2016-07-01 10:58:15 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-10-08 13:27:17 +0200
commitabb5291cd5dc98211273e5d3b516a6a0ed8b980f (patch)
tree8b3664bfd7ea3187fe46acfb5c8b96c8b7d7d0ca /src/Wallabag
parente4b46f77ef2984b33f4dff0efea0585c7ab0cfbf (diff)
downloadwallabag-abb5291cd5dc98211273e5d3b516a6a0ed8b980f.tar.gz
wallabag-abb5291cd5dc98211273e5d3b516a6a0ed8b980f.tar.zst
wallabag-abb5291cd5dc98211273e5d3b516a6a0ed8b980f.zip
CS
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/Controller/ConfigController.php14
-rw-r--r--src/Wallabag/UserBundle/Entity/User.php12
2 files changed, 13 insertions, 13 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 0a306d57..3cafd1bc 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -252,13 +252,13 @@ class ConfigController extends Controller
252 return $config; 252 return $config;
253 } 253 }
254 254
255 /** 255 /**
256 * Delete account for current user. 256 * Delete account for current user.
257 * 257 *
258 * @Route("/account/delete", name="delete_account") 258 * @Route("/account/delete", name="delete_account")
259 * 259 *
260 * @return \Symfony\Component\HttpFoundation\RedirectResponse 260 * @return \Symfony\Component\HttpFoundation\RedirectResponse
261 */ 261 */
262 public function deleteAccountAction() 262 public function deleteAccountAction()
263 { 263 {
264 $em = $this->get('fos_user.user_manager'); 264 $em = $this->get('fos_user.user_manager');
diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php
index eb7774cd..ae12e5d5 100644
--- a/src/Wallabag/UserBundle/Entity/User.php
+++ b/src/Wallabag/UserBundle/Entity/User.php
@@ -243,11 +243,11 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf
243 243
244 public function serialize() 244 public function serialize()
245 { 245 {
246 return serialize($this->id); 246 return serialize($this->id);
247 } 247 }
248 248
249 public function unserialize($serialized) 249 public function unserialize($serialized)
250 { 250 {
251 $this->id = unserialize($serialized); 251 $this->id = unserialize($serialized);
252 } 252 }
253} 253}