Skip to content

Commit

Permalink
Merge branch 'release/4.0.14'
Browse files Browse the repository at this point in the history
  • Loading branch information
thetutlage committed Aug 22, 2017
2 parents 96a5e66 + ce86c64 commit 1d460e6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,8 @@
<a name="4.0.14"></a>
## [4.0.14](https://github.com/adonisjs/adonis-framework/compare/v4.0.13...v4.0.14) (2017-08-22)



<a name="4.0.13"></a>
## [4.0.13](https://github.com/adonisjs/adonis-framework/compare/v4.0.12...v4.0.13) (2017-08-22)

Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "@adonisjs/framework",
"version": "4.0.13",
"version": "4.0.14",
"description": "Adonis framework makes it easy for you to write webapps with less code",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion providers/ViewProvider.js
Expand Up @@ -63,7 +63,7 @@ class ViewProvider extends ServiceProvider {
Context.getter('view', function () {
const requestLocals = {
request: this.request,
auth: this.auth || {},
auth: this.auth ? (this.auth.current || this.auth.authenticatorInstance) : {},
url: this.request.url(),
is: function (matchWith) {
return this.url().replace(/^\/|\/$/) === matchWith.replace(/^\/|\/$/)
Expand Down

0 comments on commit 1d460e6

Please sign in to comment.