Merge branch 'dev' into test.customwristbands.cz

2016-04-06 20:31:02 +02:00
parent 5858820cb7 7fc01fa1ec
commit d231065fb8
1 changed files with 1 additions and 1 deletions
@@ -177,7 +177,7 @@ class Content extends Model
        // join user email and user name to results when needed
        if ($joinAuthor) {
            $query = $query->join('users', 'users.id', '=', 'contents.user_id')
-                           ->addSelect('COALESCE(users.name, users.email) AS author_name')
+                           ->addSelect(DB::raw('COALESCE(users.name, users.email) AS author_name'))
                           ->addSelect('users.email AS author_email');
        }