From 885dfe0375992d6954032caae0a0d0cb69bb35bd Mon Sep 17 00:00:00 2001
From: fSerny <fabien.serny@prestashop.com>
Date: Mon, 5 Mar 2012 14:02:07 +0000
Subject: [PATCH] // Removing Addons My Account Tab

---
 .../controllers/addons_my_account/content.tpl |  27 -------------
 cache/class_index.php                         |   1 -
 .../admin/AdminAddonsMyAccountController.php  |  37 ------------------
 .../data/img/t/AdminAddonsMyAccount.gif       | Bin 1461 -> 0 bytes
 install-dev/data/xml/tab.xml                  |   3 --
 install-dev/langs/de/data/tab.xml             |   1 -
 install-dev/langs/en/data/tab.xml             |   1 -
 install-dev/langs/es/data/tab.xml             |   1 -
 install-dev/langs/fr/data/tab.xml             |   1 -
 install-dev/langs/it/data/tab.xml             |   1 -
 override/classes/AdminTab.php                 |  13 +++---
 .../classes/controller/FrontController.php    |  35 +++++++++++++++--
 12 files changed, 38 insertions(+), 83 deletions(-)
 delete mode 100644 admin-dev/themes/default/template/controllers/addons_my_account/content.tpl
 delete mode 100644 controllers/admin/AdminAddonsMyAccountController.php
 delete mode 100644 install-dev/data/img/t/AdminAddonsMyAccount.gif

diff --git a/admin-dev/themes/default/template/controllers/addons_my_account/content.tpl b/admin-dev/themes/default/template/controllers/addons_my_account/content.tpl
deleted file mode 100644
index d551215c3..000000000
--- a/admin-dev/themes/default/template/controllers/addons_my_account/content.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-{*
-* 2007-2012 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2012 PrestaShop SA
-*  @version  Release: $Revision$
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
-<iframe frameborder="no" style="margin:0px;padding:0px;width:960px;height:920px" src="http://addons.prestashop.com/iframe/myaccount.php?parentUrl={$parentDomain}"></iframe>
-<div class="clear">&nbsp;</div>
diff --git a/cache/class_index.php b/cache/class_index.php
index 8fb3e8659..85e0ba68a 100644
--- a/cache/class_index.php
+++ b/cache/class_index.php
@@ -22,7 +22,6 @@
   'AdminAddonsCatalogController' => 'override/controllers/admin/AdminAddonsCatalogController.php',
   'AdminAddonsCatalogControllerCore' => 'controllers/admin/AdminAddonsCatalogController.php',
   'AdminAddonsMyAccountController' => 'override/controllers/admin/AdminAddonsMyAccountController.php',
-  'AdminAddonsMyAccountControllerCore' => 'controllers/admin/AdminAddonsMyAccountController.php',
   'AdminAddressesController' => 'override/controllers/admin/AdminAddressesController.php',
   'AdminAddressesControllerCore' => 'controllers/admin/AdminAddressesController.php',
   'AdminAdminPreferencesController' => 'override/controllers/admin/AdminAdminPreferencesController.php',
diff --git a/controllers/admin/AdminAddonsMyAccountController.php b/controllers/admin/AdminAddonsMyAccountController.php
deleted file mode 100644
index 4e799f457..000000000
--- a/controllers/admin/AdminAddonsMyAccountController.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/*
-* 2007-2012 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2012 PrestaShop SA
-*  @version  Release: $Revision: 6844 $
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-class AdminAddonsMyAccountControllerCore extends AdminController
-{
-	public function initContent()
-	{
-		$this->context->smarty->assign('parentDomain', Tools::getHttpHost(true).substr($_SERVER['REQUEST_URI'], 0, -1 * strlen(basename($_SERVER['REQUEST_URI']))));
-		parent::initContent();
-	}
-}
-
-
diff --git a/install-dev/data/img/t/AdminAddonsMyAccount.gif b/install-dev/data/img/t/AdminAddonsMyAccount.gif
deleted file mode 100644
index 2104e0bed91fad53006e5889705b14bcd36ec799..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1461
zcmZ?wbhEHb6k!lyxN6G~RLB{a&+eDS5s=5OW5?u^#bM#c99Y2Vk;3km%^{`E=$$MU
zkS*+&pyeH_>KCu4Vaa6X#ZuJfo?2}ll&YCgZ($$7np|b>p1>NBW$v257M!JGAI=_I
zuIiP_8JNc@smACM$7UVG=AXmvmB#KHr)})P5}3!6P-5;AryiYQYwjWuk|$x{!mOan
zY~smc?9S{Q!<JQNC!@tEqrqtJtKb^T?U~B%nat&p%$ihgrfkF%T*Scu1B(B-BYXoC
zToOwXfwYZ%ML}Y6c4~=2Qfhi;o~_dR-TRdkGE;1o!cBb*d<&dYGcrA@ic*8C{6dne
zvXd=Sl<e&kY$~iOatm@(OA-|-a&z*EttxDl5>xV%Qmue&kg&dz0$52&wylyQNJ0T*
zr*nQ$s)DJWfo`&anSp|tp`M|!iMhGCj)IYap@F`Ek-njkuA#Y=v5}R5fdUjL0c|Tv
zNwW%aaf8|g<k>1^l#~=$>Fbx5m+O@q>*W`v>l<2HT7t|lGSUUA&@HaaD@m--%_~-h
znc$LIoLrPyP?DLSrvNfBF)6>a#8wIDQivCF3w(Xy2Im#)fjy*`oS&;-kyxN_sAr&`
zn+x(6SaoqpP%6S1SXCE?R2HP_2c;J0mlh?b0+lPnGy}s9zeOO0K-XCL7i9t?B{9b(
zKe;qFHLt|e#a0O@qnDDIVr5`rVPI%zZen0=WMF1tXy|BR;A-LK>f~%`X>93cU;;A(
zn_hEcV^cFzBXcKbH=r3VZWab6#xBN2POh#-mWC!~aJ`;+#U+V($*C}VGlBL(^_t<;
zYvo*&npl!w6q28x14{t`8Tlpo#Toep3eLf%3ciWSnRy^SD0(2ibxAGCEK5ysE6UGR
z0Ee$tCKme*ObPiLqBn({Fw+M*Mjw<okP-__2$%vvOnA}<a^RUKH4m6$ihx;z@&CWS
ze}4b^`Q!VyuU|fY`uO4fySHy%zk2!N`Lm}_9zS~c;Qqb4cW&RhdE@%Et5+^xx_III
zxwB_ZpE`Ns__3o$4j(#rVE?|odv@>Ixnujbty?y4+PGo;y0vRouUffc`Ld-;7B5=3
zVE(+hb7s$)Ib-^?sZ%CTnmD1queYbWtFxoMt+l1Osj;EHuC}JSs<NWIthA)KsIVYE
zFE=MUD>EZKEj1-MDKQ~FE;c4QDl#HGEHorIC@{d^&)3J>%hSW%&DF)($<e{y&eq1-
z%F@Ez%+$o#2$(JPbak|~G&R)KR8^Ff6cyy<WM!nKBqhYfL`8&!1O@o{czL+FI62ta
zSXr2v7#SE8f3g5cTLv9afdeWt8Q6*r%q#HFk?KFOr08UhRrP|INglKHqS<C_5UX4}
z&9KpT#VJKEZ<z;aO&u()Y(?${6BrgxU={Qz;Lvm9lj4!LVPIrtw_()b=J!;$nLLHr
r$Xm{aUC36Jfm6g=!iLF7nweG8TSL^!Nm5wcfAf~D+qT;}GFSruifY`i

diff --git a/install-dev/data/xml/tab.xml b/install-dev/data/xml/tab.xml
index d37c759e1..9d0c171a0 100644
--- a/install-dev/data/xml/tab.xml
+++ b/install-dev/data/xml/tab.xml
@@ -189,9 +189,6 @@
     <tab id="Modules_Themes_Catalog" id_parent="Modules" active="1">
       <class_name>AdminAddonsCatalog</class_name>
     </tab>
-    <tab id="My_Account" id_parent="Modules" active="1">
-      <class_name>AdminAddonsMyAccount</class_name>
-    </tab>
     <tab id="Positions" id_parent="Modules" active="1">
       <class_name>AdminModulesPositions</class_name>
     </tab>
diff --git a/install-dev/langs/de/data/tab.xml b/install-dev/langs/de/data/tab.xml
index 86755ad79..2cb1469ca 100644
--- a/install-dev/langs/de/data/tab.xml
+++ b/install-dev/langs/de/data/tab.xml
@@ -61,7 +61,6 @@
   <tab id="Translations" name="&#xDC;bersetzungen"/>
   <tab id="Modules_1" name="Module"/>
   <tab id="Modules_Themes_Catalog" name="Module und Themenkatalog"/>
-  <tab id="My_Account" name="Mein Konto"/>
   <tab id="Positions" name="Positionen"/>
   <tab id="Payment" name="Zahlung"/>
   <tab id="General" name="General"/>
diff --git a/install-dev/langs/en/data/tab.xml b/install-dev/langs/en/data/tab.xml
index 100acb825..ab8ee897f 100644
--- a/install-dev/langs/en/data/tab.xml
+++ b/install-dev/langs/en/data/tab.xml
@@ -61,7 +61,6 @@
   <tab id="Translations" name="Translations"/>
   <tab id="Modules_1" name="Modules"/>
   <tab id="Modules_Themes_Catalog" name="Modules &amp; Themes Catalog"/>
-  <tab id="My_Account" name="My Account"/>
   <tab id="Positions" name="Positions"/>
   <tab id="Payment" name="Payment"/>
   <tab id="General" name="General"/>
diff --git a/install-dev/langs/es/data/tab.xml b/install-dev/langs/es/data/tab.xml
index 7f45c33f2..83ada8a0f 100644
--- a/install-dev/langs/es/data/tab.xml
+++ b/install-dev/langs/es/data/tab.xml
@@ -61,7 +61,6 @@
   <tab id="Translations" name="Traducciones"/>
   <tab id="Modules_1" name="M&#xF3;dulos"/>
   <tab id="Modules_Themes_Catalog" name="Modules &amp; Themes Catalog"/>
-  <tab id="My_Account" name="My Account"/>
   <tab id="Positions" name="Posiciones"/>
   <tab id="Payment" name="Pago"/>
   <tab id="General" name="General"/>
diff --git a/install-dev/langs/fr/data/tab.xml b/install-dev/langs/fr/data/tab.xml
index 5cc005610..9a1cfc005 100644
--- a/install-dev/langs/fr/data/tab.xml
+++ b/install-dev/langs/fr/data/tab.xml
@@ -61,7 +61,6 @@
   <tab id="Translations" name="Traductions"/>
   <tab id="Modules_1" name="Modules"/>
   <tab id="Modules_Themes_Catalog" name="Catalogue de modules et th&#xE8;mes"/>
-  <tab id="My_Account" name="Mon compte"/>
   <tab id="Positions" name="Positions"/>
   <tab id="Payment" name="Paiement"/>
   <tab id="General" name="G&#xE9;n&#xE9;rales"/>
diff --git a/install-dev/langs/it/data/tab.xml b/install-dev/langs/it/data/tab.xml
index ded412d58..4303ce2a6 100644
--- a/install-dev/langs/it/data/tab.xml
+++ b/install-dev/langs/it/data/tab.xml
@@ -61,7 +61,6 @@
   <tab id="Translations" name="Traduzioni"/>
   <tab id="Modules_1" name="Moduli"/>
   <tab id="Modules_Themes_Catalog" name="Moduli &amp; Temi catalogo"/>
-  <tab id="My_Account" name="Il mio Account"/>
   <tab id="Positions" name="Posizioni"/>
   <tab id="Payment" name="Pagamento"/>
   <tab id="General" name="General"/>
diff --git a/override/classes/AdminTab.php b/override/classes/AdminTab.php
index edb772765..46cc35cd9 100644
--- a/override/classes/AdminTab.php
+++ b/override/classes/AdminTab.php
@@ -1,7 +1,6 @@
-<?php
-
-abstract class AdminTab extends AdminTabCore
-{
-
-}
-
+<?php
+
+class AdminTab extends AdminTabCore
+{
+	public static $currentIndex;
+}
\ No newline at end of file
diff --git a/override/classes/controller/FrontController.php b/override/classes/controller/FrontController.php
index 8692c6241..cedcb362a 100644
--- a/override/classes/controller/FrontController.php
+++ b/override/classes/controller/FrontController.php
@@ -1,7 +1,36 @@
 <?php
+/*
+* 2007-2012 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2012 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
 
 class FrontController extends FrontControllerCore
 {
-
-}
-
+	public function run()
+	{		
+		parent::run();
+		
+		Compatibility::resetOverride();
+	}
+}
\ No newline at end of file