From 08f7a9de32426c146b3d4f9415b67cb11a977287 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Tue, 5 Mar 2019 10:35:41 -0500
Subject: [PATCH] Skills: Fix htaccess url for badge - refs BT#15374

---
 .htaccess             | 6 +++---
 main/badge/issued.php | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.htaccess b/.htaccess
index f446e70005..0c44c072fd 100755
--- a/.htaccess
+++ b/.htaccess
@@ -53,12 +53,12 @@ RewriteRule ^session/(\d{1,})/about/?$ main/session/about.php?session_id=$1 [L]
 RewriteRule ^course/(\d{1,})/about/?$ main/course_info/about.php?course_id=$1 [L]
 
 # Issued individual badge friendly URL
-RewriteRule ^badge/(\d{1,}) main/badge/issued.php?issue=$1 [L]
+RewriteRule ^badge/(\d{1,})/?$ main/badge/issued.php?issue=$1 [L]
 
 # Issued badges friendly URL
-RewriteRule ^skill/(\d{1,})/user/(\d{1,}) main/badge/issued_all.php?skill=$1&user=$2 [L]
+RewriteRule ^skill/(\d{1,})/user/(\d{1,})/?$ main/badge/issued_all.php?skill=$1&user=$2 [L]
 # Support deprecated URL (avoid 404)
-RewriteRule ^badge/(\d{1,})/user/(\d{1,}) main/badge/issued_all.php?skill=$1&user=$2 [L]
+RewriteRule ^badge/(\d{1,})/user/(\d{1,})/?$ main/badge/issued_all.php?skill=$1&user=$2 [L]
 
 # Support old URLs using the exercice (with a c) folder rather than exercise
 RewriteRule ^main/exercice/(.*)$ main/exercise/$1 [QSA,L]
diff --git a/main/badge/issued.php b/main/badge/issued.php
index df9962150e..517734a1ed 100644
--- a/main/badge/issued.php
+++ b/main/badge/issued.php
@@ -16,7 +16,6 @@ use SkillRelUser as SkillRelUserManager;
 require_once __DIR__.'/../inc/global.inc.php';
 
 $issue = isset($_REQUEST['issue']) ? (int) $_REQUEST['issue'] : 0;
-$userId = isset($_REQUEST['user']) ? (int) $_REQUEST['user'] : 0;
 
 if (empty($issue)) {
     api_not_allowed(true);