Skip to content

Commit

Permalink
update v1.0.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
sujitprasad12 committed Jan 29, 2016
1 parent b1d1ebb commit 0bcbc04
Show file tree
Hide file tree
Showing 28 changed files with 1,981 additions and 89 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ APP_ENV=local
APP_DEBUG=true
APP_KEY=SomeRandomString
DB_HOST=localhost
DB_DATABASE=fav2222
DB_DATABASE=testaaaa
DB_USERNAME=root
DB_PASSWORD=
CACHE_DRIVER=file
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/node_modules
30 changes: 15 additions & 15 deletions app/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,21 @@ public function report(Exception $e)
*/
public function render($request, Exception $e)
{
if(config('app.debug') == false) {
if ($this->isHttpException($e) && $e->getStatusCode() == 404) {
return response()->view('errors.404', []);
} else {
if(\Config::get('database.install') == 1) {
// if(\Config::get('app.ErrorLog') == '%1%') {
// \App\Http\Controllers\Common\SettingsController::smtp();
// \Mail::send('errors.report', array('e' => $e), function ($message) {
// $message->to('', '')->subject('Faveo HELPDESK Pro ERROR');
// });
// }
}
return response()->view('errors.500', []);
}
}
// if(config('app.debug') == false) {
// if ($this->isHttpException($e) && $e->getStatusCode() == 404) {
// return response()->view('errors.404', []);
// } else {
// if(\Config::get('database.install') == 1) {
// // if(\Config::get('app.ErrorLog') == '%1%') {
// // \App\Http\Controllers\Common\SettingsController::smtp();
// // \Mail::send('errors.report', array('e' => $e), function ($message) {
// // $message->to('', '')->subject('Faveo HELPDESK Pro ERROR');
// // });
// // }
// }
// return response()->view('errors.500', []);
// }
// }
return parent::render($request, $e);

if ($this->isHttpException($e))
Expand Down
Loading

0 comments on commit 0bcbc04

Please sign in to comment.