Merge pull request YOURLS#2465 from byunite/feature/jquery-update

Feature: update jquery to version 3.3.1 and jquery.tablesorter to 2.31.1
BardoQi · Nov 23, 2018 · 32874cf · 32874cf
2 parents 1cfe955 + e7df0dc
commit 32874cf
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 49 deletions.
diff --git a/includes/functions-html.php b/includes/functions-html.php
@@ -88,7 +88,7 @@ function yourls_html_head( $context = 'index', $title = '' ) {
 	<meta name="description" content="YOURLS &raquo; Your Own URL Shortener' | <?php yourls_site_url(); ?>" />
 	<?php yourls_do_action('html_head_meta', $context); ?>
 	<link rel="shortcut icon" href="<?php yourls_favicon(); ?>" />
-	<script src="<?php yourls_site_url(); ?>/js/jquery-2.2.4.min.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
+	<script src="<?php yourls_site_url(); ?>/js/jquery-3.3.1.min.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
 	<script src="<?php yourls_site_url(); ?>/js/common.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
 	<script src="<?php yourls_site_url(); ?>/js/jquery.notifybar.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
 	<link rel="stylesheet" href="<?php yourls_site_url(); ?>/css/style.css?v=<?php echo YOURLS_VERSION; ?>" type="text/css" media="screen" />
@@ -98,7 +98,8 @@ function yourls_html_head( $context = 'index', $title = '' ) {
 	<?php } ?>
 	<?php if ( $tablesorter ) { ?>
 		<link rel="stylesheet" href="<?php yourls_site_url(); ?>/css/tablesorter.css?v=<?php echo YOURLS_VERSION; ?>" type="text/css" media="screen" />
-		<script src="<?php yourls_site_url(); ?>/js/jquery.tablesorter.min.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
+		<script src="<?php yourls_site_url(); ?>/js/jquery-3.tablesorter.min.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
+		<script src="<?php yourls_site_url(); ?>/js/tablesorte.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
 	<?php } ?>
 	<?php if ( $insert ) { ?>
 		<script src="<?php yourls_site_url(); ?>/js/insert.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>

diff --git a/js/jquery-3.3.1.min.js b/js/jquery-3.3.1.min.js
diff --git a/js/jquery-3.tablesorter.min.js b/js/jquery-3.tablesorter.min.js