Merge branch 'dev' into test.customwristbands.cz

2016-04-06 20:28:22 +02:00
parent e3d715d2d0 43051501bd
commit 5858820cb7
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('users.name AS author_name')
+                           ->addSelect('COALESCE(users.name, users.email) AS author_name')
                           ->addSelect('users.email AS author_email');
        }