Merge with master

2 files changed, 5 insertions, 3 deletions

diff --git a/app/Http/Controllers/AdminPaginationController.php b/app/Http/Controllers/AdminPaginationController.php
index f7d7a79..156bea4 100644
--- a/app/Http/Controllers/AdminPaginationController.php
+++ b/app/Http/Controllers/AdminPaginationController.php
@@ -123,7 +123,8 @@ class AdminPaginationController extends Controller {
                     return $link->clicks;
                 }
             })
-            ->escapeColumns(['short_url', 'long_url', 'creator'])
+            ->editColumn('long_url', '<a target="_blank" title="{{ $long_url }}" href="{{ $long_url }}">{{ str_limit($long_url, 50) }}</a>')
+            ->escapeColumns(['short_url', 'creator'])
             ->make(true);
     }
 
@@ -145,7 +146,8 @@ class AdminPaginationController extends Controller {
                     return $link->clicks;
                 }
             })
-            ->escapeColumns(['short_url', 'long_url'])
+            ->editColumn('long_url', '<a target="_blank" title="{{ $long_url }}" href="{{ $long_url }}">{{ str_limit($long_url, 50) }}</a>')
+            ->escapeColumns(['short_url'])
             ->make(true);
     }
 }
diff --git a/app/Http/Controllers/Api/ApiLinkController.php b/app/Http/Controllers/Api/ApiLinkController.php
index 30f007a..e6449b1 100644
--- a/app/Http/Controllers/Api/ApiLinkController.php
+++ b/app/Http/Controllers/Api/ApiLinkController.php
@@ -43,7 +43,7 @@ class ApiLinkController extends ApiController {
         $user = self::getApiUserInfo($request);
 
         // Validate URL form data
-        $validator = Validator::make($request, [
+        $validator = \Validator::make($request, [
             'url_ending' => 'required|alpha_dash'
         ]);