fixes #1099 - add MySQL warning if client/server versions are incompatible

4 files changed, 24 insertions, 2 deletions

diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 2ce58119a1..3d97644f63 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -243,12 +243,19 @@ class Piwik_Installation_Controller extends Piwik_Controller
 		}
 
 		$this->createDbFromSessionInformation();
+		$db = Zend_Registry::get('db');
+
+		try {
+			$db->checkClientVersion();
+		} catch(Exception $e) {
+			$view->clientVersionWarning = $e->getMessage();
+		}
+
 		if(!Piwik::isDatabaseConnectionUTF8())
 		{
 			$view->charsetWarning = true;
 		}
 
-		$db = Zend_Registry::get('db');
 		$dbTimezone = $db->getCurrentTimezone();
 		$phpTimezone = date('Z');
 		if($dbTimezone !== '' && ($dbTimezone != $phpTimezone))
diff --git a/plugins/Installation/templates/databaseCheck.tpl b/plugins/Installation/templates/databaseCheck.tpl
index 39854a6fe8..c27084dc1e 100644
--- a/plugins/Installation/templates/databaseCheck.tpl
+++ b/plugins/Installation/templates/databaseCheck.tpl
@@ -11,6 +11,19 @@
 		<td>{if isset($databaseVersionOk)}{$ok}{else}{$error}{/if}</td>
 	</tr>
 	<tr>
+		<td class="label">{'Installation_DatabaseClientVersion'|translate}</td>
+		<td>{if isset($clientVersionWarning)}{$warning}{else}{$ok}{/if}</td>
+	</tr>
+{if isset($clientVersionWarning)}
+	<tr>
+		<td colspan="2">
+			<small>
+				<span style="color:#FF7F00">{$clientVersionWarning}</span>
+			</small>
+		</td>
+	</tr>
+{/if}
+	<tr>
 		<td class="label">{'Installation_DatabaseCreation'|translate}</td>
 		<td>{if isset($databaseCreated)}{$ok}{else}{$error}{/if}</td>
 	</tr>
diff --git a/plugins/Installation/templates/integrityDetails.tpl b/plugins/Installation/templates/integrityDetails.tpl
index 7a4aaad29b..edac941868 100644
--- a/plugins/Installation/templates/integrityDetails.tpl
+++ b/plugins/Installation/templates/integrityDetails.tpl
@@ -1,3 +1,6 @@
+{if !isset($warningMessages)}
+{assign var=warningMessages value=$infos.integrityErrorMessages}
+{/if}
 <div id="integrity-results" title="{'Installation_SystemCheckFileIntegrity'|translate}" style="display:none; font-size: 62.5%;">
 	<table>
 	{foreach from=$warningMessages item=msg}
diff --git a/plugins/Installation/templates/systemCheck.tpl b/plugins/Installation/templates/systemCheck.tpl
index f78c069c86..00a22c0f7c 100644
--- a/plugins/Installation/templates/systemCheck.tpl
+++ b/plugins/Installation/templates/systemCheck.tpl
@@ -147,7 +147,6 @@
 				{$error} <i>{$infos.integrityErrorMessages[0]}</i>
 			{/if}
 			{if count($infos.integrityErrorMessages) > 1}
-				{assign var=warningMessages value=$infos.integrityErrorMessages}
 				<button id="more-results" class="ui-button ui-state-default ui-corner-all">{'General_Details'|translate}</button>
 			{/if}
 		{/if}