From 48d7bc890a173a75364c2db4637bcdb6e529484f Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Mon, 2 Sep 2013 17:11:41 +0200
Subject: [PATCH] // Fixed warning in AdminModulesController (variable
 conflict)

---
 controllers/admin/AdminModulesController.php |   6 +++---
 modules/gapi/logo.png                        | Bin 346 -> 1627 bytes
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index 0e6dbe4c4..1e5875934 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -691,16 +691,16 @@ class AdminModulesControllerCore extends AdminController
 							$hooklink = 'index.php?tab=AdminModulesPositions&token='.Tools::getAdminTokenLite('AdminModulesPositions').'&show_modules='.(int)$module->id;
 							$tradlink = 'index.php?tab=AdminTranslations&token='.Tools::getAdminTokenLite('AdminTranslations').'&type=modules&lang=';
 
-							$language = '';
+							$mlanguage = '';
 							foreach (Language::getLanguages(false) as $language)
-								$language .= '<a href="'.$tradlink.$language['iso_code'].'#'.$module->name.'" ><img src="'._THEME_LANG_DIR_.$language['id_lang'].'.jpg" alt="'.$language['iso_code'].'" title="'.$language['iso_code'].'" /></a>';
+								$mlanguage .= '<a href="'.$tradlink.$language['iso_code'].'#'.$module->name.'" ><img src="'._THEME_LANG_DIR_.$language['id_lang'].'.jpg" alt="'.$language['iso_code'].'" title="'.$language['iso_code'].'" /></a>';
 
 
 							$this->context->smarty->assign(array(
 								'module_name' => $module->name,
 								'backlink' => $backlink,
 								'module_hooklink' => $hooklink,
-								'module_language' => $language
+								'module_language' => $mlanguage
 							));
 							
 							// Display checkbox in toolbar if multishop
diff --git a/modules/gapi/logo.png b/modules/gapi/logo.png
index 5e6d77799d5ca55fd9ea72c95b9031e6450ba575..08b9c8411fe9840d6e071105b662a4296a6aa39a 100644
GIT binary patch
literal 1627
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
Z{Rf2X=W8g^Hf;a^002ovPDHLkV1k5j>-PWv

literal 346
zcmV-g0j2(lP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003YNkl<ZILoDz
zyH3ME5JmGNBvL3rBBG?CMM9zjB07-hP)dqa`2;#hP;du|LIVXKL6s_e0Hq`CdTqQL
z2VZv9&lo~pBOQ;l>w7#?xCEfI4(8$CZde*DiIo>%6_ysL{(-<)*wp6>?tX*sz@wDz
zu6jBCM?ir#QHI|sn=Y+wV4{3Vg)U==DifsRJ?rr(Ou_q%$w$w|So!>-26j?~+p1>*
z+1<*I=gG&tDA=t)K2)II&dil}bLFwqsu2*WAap)QNJ@W&B*CD=P55aCq2fFkzT2$6
zi9ZDt64!^(g?>T4wxb>6ovED5UCb2l^ICeCNSwyL7Q}1mUJOqOroyp+5X~bIez_y+
s$=PCpf~Xi=Trh{cz*<3&{Y>ld10L<tk#3Y2AOHXW07*qoM6N<$f()#f{r~^~