Skip to content
Snippets Groups Projects
Commit 0b41f918 authored by snipe's avatar snipe
Browse files

Merge remote-tracking branch 'origin/develop'

parents c90604b5 01143734
Branches
No related tags found
No related merge requests found
...@@ -111,7 +111,7 @@ class LoginController extends Controller ...@@ -111,7 +111,7 @@ class LoginController extends Controller
Auth::login($user, true); Auth::login($user, true);
} else { } else {
$username = $saml->getUsername(); $username = $saml->getUsername();
Log::error("SAML user '$username' could not be found in database."); \Log::warning("SAML user '$username' could not be found in database.");
$request->session()->flash('error', trans('auth/message.signin.error')); $request->session()->flash('error', trans('auth/message.signin.error'));
$saml->clearData(); $saml->clearData();
} }
...@@ -121,7 +121,7 @@ class LoginController extends Controller ...@@ -121,7 +121,7 @@ class LoginController extends Controller
$user->save(); $user->save();
} }
} catch (\Exception $e) { } catch (\Exception $e) {
Log::error("There was an error authenticating the SAML user: " . $e->getMessage()); \Log::warning("There was an error authenticating the SAML user: " . $e->getMessage());
throw new \Exception($e->getMessage()); throw new \Exception($e->getMessage());
} }
} }
......
...@@ -78,7 +78,7 @@ final class Company extends SnipeModel ...@@ -78,7 +78,7 @@ final class Company extends SnipeModel
$company_id = null; $company_id = null;
} }
$table = ($table_name) ? DB::getTablePrefix().$table_name."." : ''; $table = ($table_name) ? $table_name."." : '';
if(\Schema::hasColumn($query->getModel()->getTable(), $column)){ if(\Schema::hasColumn($query->getModel()->getTable(), $column)){
return $query->where($table.$column, '=', $company_id); return $query->where($table.$column, '=', $company_id);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment