Merge pull request #2106 from LuckyCyborg/4.0

Overall improvements
nova-framework · Aug 13, 2018 · 6f278e0 · 6f278e0
2 parents ac24cc4 + 6968e77
commit 6f278e0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/app/Platform/Bootstrap.php b/app/Platform/Bootstrap.php
@@ -14,7 +14,7 @@
 // Define The Application Version
 //--------------------------------------------------------------------------
 
-define('VERSION', '4.0.84');
+define('VERSION', '4.0.85');
 
 //--------------------------------------------------------------------------
 // Set PHP Error Reporting Options

diff --git a/modules/Content/Views/Admin/Attachments/Index.php b/modules/Content/Views/Admin/Attachments/Index.php
@@ -13,7 +13,7 @@
 
 <div class="box box-default">
     <div class="box-body">
-        <button id="addNewUploads" class="btn btn-success btn-sm col-sm-2 pull-right"><?= __d('content', 'Add New'); ?></button>
+        <button id="addNewUploads" class="btn btn-success col-sm-2 pull-right"><?= __d('content', 'Add New'); ?></button>
         <div class="clearfix"></div>
 
         <form action="<?= site_url('admin/media/upload'); ?>" id="fm_dropzone_main" enctype="multipart/form-data" method="POST" style="display: none;">

diff --git a/modules/Roles/Controllers/Admin/Roles.php b/modules/Roles/Controllers/Admin/Roles.php
@@ -50,15 +50,18 @@ protected function validator(array $data, $id = null)
             'description' => __d('roles', 'Description'),
         );
 
+        // Create a Validator instance.
+        $validator = Validator::make($data, $rules, $messages, $attributes);
+
         // Add the custom Validation Rule commands.
-        Validator::extend('valid_name', function($attribute, $value, $parameters)
+        $validator->addExtension('valid_name', function($attribute, $value, $parameters)
         {
             $pattern = '~^(?:[\p{L}\p{Mn}\p{Pd}\'\x{2019}]+(?:$|\s+)){1,}$~u';
 
             return (preg_match($pattern, $value) === 1);
         });
 
-        return Validator::make($data, $rules, $messages, $attributes);
+        return $validator;
     }
 
     public function data(Request $request)