[joomla#32179] Version comparison in installer is not future proof (Fix

joomla#2146)
Bakual · May 12, 2014 · 0f08891 · 0f08891
1 parent 523252d
commit 0f08891
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/administrator/components/com_installer/views/database/tmpl/default.php b/administrator/components/com_installer/views/database/tmpl/default.php
@@ -41,11 +41,11 @@
 							<li><?php echo JText::_('COM_INSTALLER_MSG_DATABASE_FILTER_ERROR'); ?>
 						<?php endif; ?>
 
-						<?php if (!(strncmp($this->schemaVersion, JVERSION, 5) === 0)) : ?>
+						<?php if (version_compare($this->schemaVersion, JVERSION) != 0) : ?>
 							<li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_SCHEMA_ERROR', $this->schemaVersion, JVERSION); ?></li>
 						<?php endif; ?>
 
-						<?php if (($this->updateVersion != JVERSION)) : ?>
+						<?php if (version_compare($this->updateVersion, JVERSION) != 0) : ?>
 							<li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_UPDATEVERSION_ERROR', $this->updateVersion, JVERSION); ?></li>
 						<?php endif; ?>
 

diff --git a/administrator/components/com_installer/views/database/view.html.php b/administrator/components/com_installer/views/database/view.html.php
@@ -44,15 +44,15 @@ public function display($tpl = null)
 		$this->pagination = $this->get('Pagination');
 		$this->errorCount = count($this->errors);
 
-		if (!(strncmp($this->schemaVersion, JVERSION, 5) === 0))
+		if (version_compare($this->schemaVersion, JVERSION) != 0)
 		{
 			$this->errorCount++;
 		}
 		if (!$this->filterParams)
 		{
 			$this->errorCount++;
 		}
-		if (($this->updateVersion != JVERSION))
+		if (version_compare($this->updateVersion, JVERSION) != 0)
 		{
 			$this->errorCount++;
 		}