OpenMage: Amasty FPC 1.8.23 patch

gistfile1.txt

diff --git a/app/code/local/Amasty/Fpc/Model/Fpc.php b/app/code/local/Amasty/Fpc/Model/Fpc.php
index c2ce1cf..0ca387a 100755
--- a/app/code/local/Amasty/Fpc/Model/Fpc.php
+++ b/app/code/local/Amasty/Fpc/Model/Fpc.php
@@ -257,7 +257,9 @@ class Amasty_Fpc_Model_Fpc extends Mage_Core_Model_Cache
                     'size' => strlen($data),
                     'type' => 'page',
                     'customer_group' => Mage::getSingleton('amfpc/fpc_front')->getCustomerGroupId(),
-                    'session' => $_COOKIE['frontend']
+                    'session' => isset($_COOKIE[Mage_Core_Controller_Front_Action::SESSION_NAMESPACE])
+                        ? $_COOKIE[Mage_Core_Controller_Front_Action::SESSION_NAMESPACE]
+                        : ''
                 ))
                 ->save();
         }
@@ -465,7 +467,9 @@ class Amasty_Fpc_Model_Fpc extends Mage_Core_Model_Cache
                     'type' => 'block',
                     'block_name' => $name,
                     'customer_group' => Mage::getSingleton('amfpc/fpc_front')->getCustomerGroupId(),
-                    'session' => isset($_COOKIE['frontend']) ? $_COOKIE['frontend'] : ''
+                    'session' => isset($_COOKIE[Mage_Core_Controller_Front_Action::SESSION_NAMESPACE])
+                        ? $_COOKIE[Mage_Core_Controller_Front_Action::SESSION_NAMESPACE]
+                        : ''
                 ))
                 ->save();
         }
diff --git a/app/code/local/Amasty/Fpc/Model/Fpc/Front.php b/app/code/local/Amasty/Fpc/Model/Fpc/Front.php
index bb83b66..9a1821b 100644
--- a/app/code/local/Amasty/Fpc/Model/Fpc/Front.php
+++ b/app/code/local/Amasty/Fpc/Model/Fpc/Front.php
@@ -34,7 +34,7 @@ class Amasty_Fpc_Model_Fpc_Front extends Varien_Object
     protected static $_isAjax = null;
 
     protected $_cache = null;
-    protected $_sessionName = 'frontend';
+    protected $_sessionName = Mage_Core_Controller_Front_Action::SESSION_NAMESPACE;
     protected $_sessionStarted = false;
 
     protected $_formKey = null;
@@ -92,9 +92,7 @@ class Amasty_Fpc_Model_Fpc_Front extends Varien_Object
         }
         else
         {
-            $sessionName = (string)Mage::app()
-                ->getConfig()
-                ->getNode('global/amfpc/session_name');
+            $sessionName = Mage_Core_Controller_Front_Action::SESSION_NAMESPACE;
 
             if ($sessionName) {
                 $this->_sessionName = $sessionName;
diff --git a/app/etc/modules/Amasty_Fpc.xml b/app/etc/modules/Amasty_Fpc.xml
index 364c2ec..67f1190 100755
--- a/app/etc/modules/Amasty_Fpc.xml
+++ b/app/etc/modules/Amasty_Fpc.xml
@@ -11,7 +11,6 @@
         <Amasty_Fpc>
             <active>true</active>
             <codePool>local</codePool>
-            <edition>community</edition>
         </Amasty_Fpc>
     </modules>
 </config>