diff options
author | Jeremy <j0k3r@users.noreply.github.com> | 2015-02-12 08:50:06 +0100 |
---|---|---|
committer | Jeremy <j0k3r@users.noreply.github.com> | 2015-02-12 08:50:06 +0100 |
commit | 2f6a596760c62efd9e43602f787fa44400d522b3 (patch) | |
tree | f48b7a4a72ed33f73295634a19ce2f2c1f41768d /src/Wallabag/CoreBundle/Controller | |
parent | f8c2736a1058f7f1f2d75479e29df7d267794791 (diff) | |
parent | 8c7e0f95b925e0797d3e2bdedf890a74d86d0a60 (diff) | |
download | wallabag-2f6a596760c62efd9e43602f787fa44400d522b3.tar.gz wallabag-2f6a596760c62efd9e43602f787fa44400d522b3.tar.zst wallabag-2f6a596760c62efd9e43602f787fa44400d522b3.zip |
Merge pull request #1070 from wallabag/v2-api-tests
1st draft for testing API
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/WallabagRestController.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php index 27d11da5..e9cd8c93 100644 --- a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php | |||
@@ -20,7 +20,7 @@ class WallabagRestController extends Controller | |||
20 | * {"name"="username", "dataType"="string", "required"=true, "description"="username"} | 20 | * {"name"="username", "dataType"="string", "required"=true, "description"="username"} |
21 | * } | 21 | * } |
22 | * ) | 22 | * ) |
23 | * @return string | 23 | * @return array |
24 | */ | 24 | */ |
25 | public function getSaltAction($username) | 25 | public function getSaltAction($username) |
26 | { | 26 | { |
@@ -33,7 +33,7 @@ class WallabagRestController extends Controller | |||
33 | throw $this->createNotFoundException(); | 33 | throw $this->createNotFoundException(); |
34 | } | 34 | } |
35 | 35 | ||
36 | return $user->getSalt(); | 36 | return array($user->getSalt() ?: null); |
37 | } | 37 | } |
38 | /** | 38 | /** |
39 | * Retrieve all entries. It could be filtered by many options. | 39 | * Retrieve all entries. It could be filtered by many options. |