diff options
author | DT27 <dragonet1943@gmail.com> | 2018-02-22 05:30:51 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-22 05:30:51 +0300 |
commit | 298c22a8213fe9c794c81c91903c4e3743adf14d (patch) | |
tree | ce4d727949eb7e3f7c9debea5232e6084862fdf1 | |
parent | c6c50bc2cc5bb0aa5d8bf1706abf0218edeb612d (diff) | |
parent | a243a87de8dfea92e07e6a5f7348c0e46be9b6fe (diff) |
Merge branch 'master' into master
-rw-r--r-- | .github/ISSUE_TEMPLATE.md | 1 | ||||
-rw-r--r-- | app/Http/Controllers/AdminPaginationController.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 6348fa0..609fc18 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,4 +1,5 @@ <!--- Provide a general summary of the issue in the Title above --> +<!--- IMPORTANT: Please follow the format displayed in this template, or your ticket may be ignored. --> ## Expected Behavior <!--- If you're describing a bug, tell us what should happen --> diff --git a/app/Http/Controllers/AdminPaginationController.php b/app/Http/Controllers/AdminPaginationController.php index 01297ab..827ed39 100644 --- a/app/Http/Controllers/AdminPaginationController.php +++ b/app/Http/Controllers/AdminPaginationController.php @@ -17,8 +17,8 @@ class AdminPaginationController extends Controller { /* Cell rendering functions */ public function renderLongUrlCell($link) { - return '<a target="_blank" title="' . e($link->long_url) . '" href="'. $link->long_url .'">' . str_limit($link->long_url, 50) . '</a> - <a class="btn btn-primary btn-xs edit-long-link-btn" ng-click="editLongLink(\'' . $link->short_url . '\', \'' . $link->long_url . '\')"><i class="fa fa-edit edit-link-icon"></i></a>'; + return '<a target="_blank" title="' . e($link->long_url) . '" href="'. e($link->long_url) .'">' . e(str_limit($link->long_url, 50)) . '</a> + <a class="btn btn-primary btn-xs edit-long-link-btn" ng-click="editLongLink(\'' . e($link->short_url) . '\', \'' . e($link->long_url) . '\')"><i class="fa fa-edit edit-link-icon"></i></a>'; } public function renderClicksCell($link) { |