Merge branch '1.7'

slimkit · May 26, 2018 · 16b971a · 16b971a
2 parents 742c175 + 77bca34
commit 16b971a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/slimkit-plus-news/src/API2/Controllers/CateController.php b/packages/slimkit-plus-news/src/API2/Controllers/CateController.php
@@ -41,7 +41,7 @@ public function list(Request $request)
 
         // 我订阅的分类
         $follows = NewsCateFollow::where('user_id', $user_id)->first();
-        if ($follows && $follows->follows) {
+        if ($follows && ! $follows->follows) {
             $follows_array = explode(',', $follows->follows);
         } else {
             $follows_array = NewsCate::orderBy('rank', 'desc')->take(5)->pluck('id')->toArray();

diff --git a/resources/stubs/package/src/Providers/AppServiceProvider.stub b/resources/stubs/package/src/Providers/AppServiceProvider.stub
@@ -10,7 +10,7 @@ use Illuminate\Support\ServiceProvider;
 class AppServiceProvider extends ServiceProvider
 {
     /**
-     * Boorstrap the service provider.
+     * Bootstrap the service provider.
      *
      * @return void
      */
@@ -56,7 +56,7 @@ class AppServiceProvider extends ServiceProvider
         $this->registerCoreContainerAliases();
 
         // Register singletons.
-        $this->registerSingletions();
+        $this->registerSingletons();
 
         // Register Plus package handlers.
         $this->registerPackageHandlers();
@@ -89,7 +89,7 @@ class AppServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    protected function registerSingletions()
+    protected function registerSingletons()
     {
         // Owner handler.
         $this->app->singleton('{name}:handler', function () {