Merge branch 'release/v2.0.2'

Blogify · Jun 7, 2016 · 281f663 · 281f663
2 parents 8b57423 + 98b3a21
commit 281f663
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/database/Migrations/2015_03_03_212000_create_users_table.php b/database/Migrations/2015_03_03_212000_create_users_table.php
@@ -3,7 +3,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateUsersTable extends Migration {
+class CreateUsersTable extends Migration
+{
 
     /**
      * @var array
@@ -22,7 +23,7 @@ public function __construct()
      */
     public function up()
     {
-        if(! Schema::hasTable('users')) {
+        if (! Schema::hasTable('users')) {
             $this->createUsersTable();
         } else {
             $this->updateUSersTable();
@@ -98,17 +99,15 @@ private function fillFieldsArray()
      */
     private function createUsersTable()
     {
-        Schema::create('users', function($table)
-        {
-            foreach($this->fields as $field => $value) {
-                //$maxChars = (array_key_exists('length', $value)) ? ', ' . $value['length'] : null;
+        Schema::create('users', function ($table) {
+            foreach ($this->fields as $field => $value) {
                 $query = $table->$value['type']($field);
 
                 if (isset($value['extra'])) {
                     $query->$value['extra']();
                 }
-
             }
+
             $table->foreign('role_id')->references('id')->on('roles');
             $table->timestamps();
             $table->softDeletes();
@@ -121,8 +120,8 @@ private function createUsersTable()
      */
     private function updateUSersTable()
     {
-        Schema::table('users', function($table) {
-            foreach($this->fields as $field => $value) {
+        Schema::table('users', function ($table) {
+            foreach ($this->fields as $field => $value) {
                 if (!Schema::hasColumn('users', $field)) {
                     $query = $table->$value['type']($field);
 

diff --git a/src/Controllers/Admin/DashboardController.php b/src/Controllers/Admin/DashboardController.php
@@ -68,7 +68,9 @@ public function __construct(
         $this->comment = $comment;
         $this->tracert = $tracert;
 
-        $this->{"buildDataArrayFor".$this->auth_user->role->name}();
+        if ($this->auth_user) {
+            $this->{"buildDataArrayFor".$this->auth_user->role->name}();
+        }
     }
 
     ///////////////////////////////////////////////////////////////////////////