sync: master to devel (#2322)

pi-hole · Sep 2, 2022 · 2c5fb03 · 2c5fb03
2 parents eff52d6 + 5370780
commit 2c5fb03
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/scripts/pi-hole/php/footer.php b/scripts/pi-hole/php/footer.php
@@ -65,10 +65,10 @@
         <div class="row row-centered text-center version-info">
             <div class="col-xs-12 col-sm-12 col-md-10">
                 <ul class="<?php echo $list_class; ?>">
-                    <?php if ($docker_current) { ?>
+                    <?php if ($dockerVersionStr) { ?>
                     <li>
                         <strong>Docker Tag</strong>
-                        <?php echo $docker_current; ?>
+                        <?php echo $dockerVersionStr; ?>
                         <?php if ($docker_update) { ?> &middot; <a class="lookatme" lookatme-text="Update available!" href="<?php echo $dockerUrl.'/latest'; ?>" rel="noopener" target="_blank">Update available!</a><?php } ?>
                     </li>
                     <?php } ?>

diff --git a/scripts/pi-hole/php/update_checker.php b/scripts/pi-hole/php/update_checker.php
@@ -83,6 +83,9 @@ function checkUpdate($currentVersion, $latestVersion)
             $docker_update = false;
         } else {
             $docker_update = checkUpdate($docker_current, $docker_latest);
+
+            $dockerUrl = 'https://github.com/pi-hole/docker-pi-hole/releases';
+            $dockerVersionStr = '<a href="'.$dockerUrl.'/'.$docker_current.'" rel="noopener" target="_blank">'.$docker_current.'</a>';
         }
     } else {
         // Components comparison
@@ -99,7 +102,6 @@ function checkUpdate($currentVersion, $latestVersion)
 $coreUrl = 'https://github.com/pi-hole/pi-hole/releases';
 $webUrl = 'https://github.com/pi-hole/AdminLTE/releases';
 $ftlUrl = 'https://github.com/pi-hole/FTL/releases';
-$dockerUrl = 'https://github.com/pi-hole/docker-pi-hole/releases';
 
 // Version strings
 // If "vDev" show branch/commit, else show link