Homepage: Modified version number output

Always include major and minor numbers, always omit zeroes in the rest.
skyjake · May 25, 2016 · 587c58b · 587c58b
1 parent 268d654
commit 587c58b
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/web/classes/version.class.php b/web/classes/version.class.php
@@ -106,13 +106,14 @@ public static function ucompare($a, $b)
     public function asText($sep = '.', $omitTrailingZeros = false)
     {
         $sep = (string)$sep;
-        $omitTrailingZeros = (bool)$omitTrailingZeros;
+        /*$omitTrailingZeros = (bool)$omitTrailingZeros;
 
         if($omitTrailingZeros === false)
         {
             return "{$this->major}$sep{$this->minor}$sep{$this->patch}$sep{$this->revision}";
-        }
+        }*/
 
+        /*
         $text = '';
         if($this->revision > 0)
         {
@@ -132,8 +133,20 @@ public function asText($sep = '.', $omitTrailingZeros = false)
         }
 
         if(!empty($text)) $text = $sep . $text;
-        $text = $this->major . $text;
+        $text = $this->major . $text;*/
 
+        // Mandatory parts.
+        $text = "{$this->major}" . $sep . "{$this->minor}";
+
+        // Optional parts.
+        if($this->patch > 0 || $this->revision > 0)
+        {
+            $text .= $sep . "{$this->patch}";
+        }
+        if($this->revision > 0)
+        {
+            $text .= $sep . "{$this->revision}";
+        }
         return $text;
     }