From ca584c730c60cca3c631fc01a685f63d70ba851f Mon Sep 17 00:00:00 2001
From: vSchoener <vincent.schoener@prestashop.com>
Date: Thu, 3 Nov 2011 13:51:52 +0000
Subject: [PATCH] // Merge 1.4 -> 1.5

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9835 b9a71923-0436-4b27-9f14-aed3839534dd
---
 modules/mondialrelay/mondialrelay.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/mondialrelay/mondialrelay.php b/modules/mondialrelay/mondialrelay.php
index 641955f57..e5733790f 100755
--- a/modules/mondialrelay/mondialrelay.php
+++ b/modules/mondialrelay/mondialrelay.php
@@ -901,14 +901,15 @@ class MondialRelay extends Module
 				<ul>';
 		if (!sizeof($query))
 			$output .= '<li>'.$this->l('No shipping methods created').'</li>';
-		foreach ($query AS $Options)
-		{
-			$output .= '
+		else
+			foreach ($query AS $Options)
+			{
+				$output .= '
 					<li>
 						<a href="' . 'index.php?tab=AdminModules&configure=mondialrelay&token='.Tools::getAdminToken('AdminModules'.(int)(Tab::getIdFromClassName('AdminModules')).(int)$this->context->employee->id).'&delete_mr=' . $Options['id_mr_method'] . '"><img src="../img/admin/disabled.gif" alt="Delete" title="Delete" /></a>' . str_replace('_', ' ', $Options['mr_Name']) . ' (' . $Options['mr_ModeCol'] . '-' . $Options['mr_ModeLiv'] . ' - ' . $Options['mr_ModeAss'] . ' : '.$Options['mr_Pays_list'].')
 						<div style="float:right;"><a href="index.php?tab=AdminCarriers&id_carrier=' . (int)($Options['id_carrier']) . '&updatecarrier&token='.Tools::getAdminToken('AdminCarriers'.(int)(Tab::getIdFromClassName('AdminCarriers')).(int)$this->context->employee->id).'"><b><u>'.$this->l('Config Shipping.').'</u></b></a></div>
 					</li>';
-		}
+			}
 		$output .= '
 				</ul>
 			</fieldset>