Markshust_Enterprisefallback - Version 1.1.0

Version Notes

- Fixed bug that fell back to wrong package (enterprise/default instead of custom/default).
- Added default/default fallback so this extension can also be used on Community Edition.

Download this release

Release Info

Developer Mark Shust
Extension Markshust_Enterprisefallback
Version 1.1.0
Comparing to
See all releases


Code changes from version 1.0.1 to 1.1.0

Files changed (5) hide show
  1. app/code/community/Markshust/Enterprisefallback/Model/Design/Package.php +6 -2
  2. app/code/community/Markshust/Enterprisefallback/README/.CHANGELOG.txt.swp +0 -0
  3. app/code/community/Markshust/Enterprisefallback/README/CHANGELOG.txt +3 -0
  4. app/code/community/Markshust/Enterprisefallback/etc/config.xml +1 -1
  5. package.xml +8 -7
app/code/community/Markshust/Enterprisefallback/Model/Design/Package.php CHANGED
@@ -23,10 +23,12 @@ class Markshust_Enterprisefallback_Model_Design_Package extends Mage_Core_Model_
23
  $result = $this->_fallback($file, $params, array(
24
  array(),
25
  array('_theme' => $this->getFallbackTheme()),
26
- array('_theme' => self::DEFAULT_THEME, '_package' => 'enterprise'),
27
  array('_theme' => self::DEFAULT_THEME),
 
 
28
  ));
29
  Varien_Profiler::stop(__METHOD__);
 
30
  return $result;
31
  }
32
 
@@ -51,12 +53,14 @@ class Markshust_Enterprisefallback_Model_Design_Package extends Mage_Core_Model_
51
  $result = $this->_fallback($file, $params, array(
52
  array(),
53
  array('_theme' => $this->getFallbackTheme()),
54
- array('_theme' => self::DEFAULT_THEME, '_package' => 'enterprise'),
55
  array('_theme' => self::DEFAULT_THEME),
 
 
56
  ));
57
  }
58
  $result = $this->getSkinBaseUrl($params) . (empty($file) ? '' : $file);
59
  Varien_Profiler::stop(__METHOD__);
 
60
  return $result;
61
  }
62
  }
23
  $result = $this->_fallback($file, $params, array(
24
  array(),
25
  array('_theme' => $this->getFallbackTheme()),
 
26
  array('_theme' => self::DEFAULT_THEME),
27
+ array('_theme' => self::DEFAULT_THEME, '_package' => 'enterprise'),
28
+ array('_theme' => self::DEFAULT_THEME, '_package' => 'default'),
29
  ));
30
  Varien_Profiler::stop(__METHOD__);
31
+
32
  return $result;
33
  }
34
 
53
  $result = $this->_fallback($file, $params, array(
54
  array(),
55
  array('_theme' => $this->getFallbackTheme()),
 
56
  array('_theme' => self::DEFAULT_THEME),
57
+ array('_theme' => self::DEFAULT_THEME, '_package' => 'enterprise'),
58
+ array('_theme' => self::DEFAULT_THEME, '_package' => 'default'),
59
  ));
60
  }
61
  $result = $this->getSkinBaseUrl($params) . (empty($file) ? '' : $file);
62
  Varien_Profiler::stop(__METHOD__);
63
+
64
  return $result;
65
  }
66
  }
app/code/community/Markshust/Enterprisefallback/README/.CHANGELOG.txt.swp ADDED
Binary file
app/code/community/Markshust/Enterprisefallback/README/CHANGELOG.txt CHANGED
@@ -4,3 +4,6 @@ Markshust_Enterprisefallback
4
  --------------------------------------------------------------------------------
5
  1.0.0 (Released NOV-30-2011)
6
  - Initial release.
 
 
 
4
  --------------------------------------------------------------------------------
5
  1.0.0 (Released NOV-30-2011)
6
  - Initial release.
7
+ 1.1.0 (Released MAR-23-2012)
8
+ - Fixed bug that fell back to wrong package (enterprise/default instead of custom/default).
9
+ - Added default/default fallback so this extension can also be used on Community Edition.
app/code/community/Markshust/Enterprisefallback/etc/config.xml CHANGED
@@ -8,7 +8,7 @@
8
  <config>
9
  <modules>
10
  <Markshust_Enterprisefallback>
11
- <version>1.0.1</version>
12
  </Markshust_Enterprisefallback>
13
  </modules>
14
 
8
  <config>
9
  <modules>
10
  <Markshust_Enterprisefallback>
11
+ <version>1.1.0</version>
12
  </Markshust_Enterprisefallback>
13
  </modules>
14
 
package.xml CHANGED
@@ -1,18 +1,19 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Markshust_Enterprisefallback</name>
4
- <version>1.0.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://sam.zoy.org/wtfpl/">WTFPL</license>
7
  <channel>community</channel>
8
  <extends/>
9
- <summary>This extension adds the Enterprise package/theme to the fallback layer of Magento.</summary>
10
- <description>This extension adds the Enterprise theme to the fallback layer of Magento. This allows you to create your own namespace_theme, while still falling back to the Enterprise package for non-existent files.</description>
11
- <notes>Initial release</notes>
 
12
  <authors><author><name>Mark Shust</name><user>markoshust</user><email>mark@shust.com</email></author></authors>
13
- <date>2012-02-27</date>
14
- <time>22:34:32</time>
15
- <contents><target name="magecommunity"><dir name="Markshust"><dir name="Enterprisefallback"><dir name="Model"><dir name="Design"><file name="Package.php" hash="ba2786ecc7e7e10cc038f1dfe2554ea7"/></dir></dir><dir name="README"><file name="CHANGELOG.txt" hash="1d1a925876a0bdf8571933f26ae1c153"/><file name="WTFPL.txt" hash="f312a7c4d02230e8f2b537295d375c69"/></dir><dir name="etc"><file name="config.xml" hash="6ec9695cda7eb79a0781de7e90eeb069"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Markshust_Enterprisefallback.xml" hash="e5cdbc03b6dfa4a8b3e7e24a907aedb0"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Markshust_Enterprisefallback</name>
4
+ <version>1.1.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://sam.zoy.org/wtfpl/">WTFPL</license>
7
  <channel>community</channel>
8
  <extends/>
9
+ <summary>This extension adds the Enterprise &amp; Default packages/themes to the fallback layer of Magento.</summary>
10
+ <description>This extension adds the Enterprise theme to the fallback layer of Enterprise Edition, and the Default theme to the fallback layer of Community Edition &amp; Enterprise Edition. This allows you to create your own namespace_theme, while still falling back to the standard package (enterprise or default) for non-existent files.</description>
11
+ <notes>- Fixed bug that fell back to wrong package (enterprise/default instead of custom/default).&#xD;
12
+ - Added default/default fallback so this extension can also be used on Community Edition.</notes>
13
  <authors><author><name>Mark Shust</name><user>markoshust</user><email>mark@shust.com</email></author></authors>
14
+ <date>2012-03-23</date>
15
+ <time>16:26:21</time>
16
+ <contents><target name="magecommunity"><dir name="Markshust"><dir name="Enterprisefallback"><dir name="Model"><dir name="Design"><file name="Package.php" hash="ed3c1d7f3a120321625e9481f0c4efce"/></dir></dir><dir name="README"><file name="CHANGELOG.txt" hash="49ae89765dbdd8d90bd3ad256810adc0"/><file name="WTFPL.txt" hash="f312a7c4d02230e8f2b537295d375c69"/><file name=".CHANGELOG.txt.swp" hash="bb49ff869ae753fa9b00f4508baa93bf"/></dir><dir name="etc"><file name="config.xml" hash="e622718ee6f66ce5e7015b342f8b7257"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Markshust_Enterprisefallback.xml" hash="e5cdbc03b6dfa4a8b3e7e24a907aedb0"/></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>