aboutsummaryrefslogtreecommitdiffhomepage
path: root/application/front/controller
diff options
context:
space:
mode:
Diffstat (limited to 'application/front/controller')
-rw-r--r--application/front/controller/visitor/ErrorController.php5
-rw-r--r--application/front/controller/visitor/LoginController.php1
2 files changed, 1 insertions, 5 deletions
diff --git a/application/front/controller/visitor/ErrorController.php b/application/front/controller/visitor/ErrorController.php
index 10aa84c8..8da11172 100644
--- a/application/front/controller/visitor/ErrorController.php
+++ b/application/front/controller/visitor/ErrorController.php
@@ -28,10 +28,7 @@ class ErrorController extends ShaarliVisitorController
28 // Internal error (any other Throwable) 28 // Internal error (any other Throwable)
29 if ($this->container->conf->get('dev.debug', false)) { 29 if ($this->container->conf->get('dev.debug', false)) {
30 $this->assignView('message', $throwable->getMessage()); 30 $this->assignView('message', $throwable->getMessage());
31 $this->assignView( 31 $this->assignView('stacktrace', exception2text($throwable));
32 'stacktrace',
33 nl2br(get_class($throwable) .': '. PHP_EOL . $throwable->getTraceAsString())
34 );
35 } else { 32 } else {
36 $this->assignView('message', t('An unexpected error occurred.')); 33 $this->assignView('message', t('An unexpected error occurred.'));
37 } 34 }
diff --git a/application/front/controller/visitor/LoginController.php b/application/front/controller/visitor/LoginController.php
index 121ba40b..f5038fe3 100644
--- a/application/front/controller/visitor/LoginController.php
+++ b/application/front/controller/visitor/LoginController.php
@@ -65,7 +65,6 @@ class LoginController extends ShaarliVisitorController
65 } 65 }
66 66
67 if (!$this->container->loginManager->checkCredentials( 67 if (!$this->container->loginManager->checkCredentials(
68 $this->container->environment['REMOTE_ADDR'],
69 client_ip_id($this->container->environment), 68 client_ip_id($this->container->environment),
70 $request->getParam('login'), 69 $request->getParam('login'),
71 $request->getParam('password') 70 $request->getParam('password')