Merge branch 'test.customwristbands.cz' into dev

This commit is contained in:
Michal Kváček
2016-04-07 00:24:04 +02:00
+2 -2
View File
@@ -171,7 +171,7 @@ class Content extends Model
// filter results using handler // filter results using handler
if ($handler) { if ($handler) {
$query = $query->where('module_handler', $handler); $query = $query->where('contents.module_handler', $handler);
} }
// join user email and user name to results when needed // join user email and user name to results when needed
@@ -293,4 +293,4 @@ class Content extends Model
{ {
return $this->belongsTo('App\Models\User', 'user_id'); return $this->belongsTo('App\Models\User', 'user_id');
} }
} }