github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-21 06:24:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Toby Zerner 2015-04-25 22:45:27 +09:30
commit 0fc1691103
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
framework/core/less/.gitkeep
View File

6
framework/core/src/Core/Models/RegisteredTypesScope.php
View File

@ -2,7 +2,7 @@
use Illuminate\Database\Eloquent\ScopeInterface;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Model as Eloquent;
class RegisteredTypesScope implements ScopeInterface
{
@ -34,7 +34,7 @@ class RegisteredTypesScope implements ScopeInterface
* @param \Illuminate\Database\Eloquent\Model $model
* @return void
*/
public function apply(Builder $builder, Model $model)
public function apply(Builder $builder, Eloquent $model)
{
$query = $builder->getQuery();
@ -53,7 +53,7 @@ class RegisteredTypesScope implements ScopeInterface
* @param \Illuminate\Database\Eloquent\Model $model
* @return void
*/
public function remove(Builder $builder, Model $model)
public function remove(Builder $builder, Eloquent $model)
{
$query = $builder->getQuery();

0
framework/core/tests/.gitkeep
View File

0
framework/core/views/.gitkeep
View File

3
framework/core/views/emails/confirm.blade.php
View File

@ -4,3 +4,6 @@ Someone (hopefully you!) has signed up to the forum '{{ $forumTitle }}' with thi
If this was you, simply visit the following link and your account will be activated:
{{ $url }}
If you did not sign up, please ignore this email.