Fixed #1. Rename comunity directory to community.

ceefour · May 25, 2011 · 9fa2810 · 9fa2810
1 parent 4eaebda
commit 9fa2810
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 3 deletions.
diff --git a/...luvas/MagentoTweaks/Block/Productview.php → ...luvas/MagentoTweaks/Block/Productview.php b/...luvas/MagentoTweaks/Block/Productview.php → ...luvas/MagentoTweaks/Block/Productview.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Soluvas
+ * http://www.soluvas.com/
  *
  * NOTICE OF LICENSE
  *
@@ -17,14 +18,18 @@
  */
 
 /**
- * Enhanced Product view Block
+ * Enhanced Product view Block.
+ * 
+ * WARNING: FIXME: Patched version that merges changes from Yoast_MetaRobots!!!!
+ * WARNING: FIXME: Depend on Yoast_MetaRobots to resolve conflict!!!
  *
  * @category   Soluvas
  * @package    Soluvas_MagentoTweaks
  * @author     Soluvas Developers <info@soluvas.com>
  * @see 		Mage_Catalog_Block_Product_View
  */
-class Soluvas_MagentoTweaks_Block_Productview extends Mage_Catalog_Block_Product_View
+class Soluvas_MagentoTweaks_Block_Productview extends /*Mage_Catalog_Block_Product_View*/
+	Yoast_MetaRobots_Block_Catalog_Product_View
 {
     /**
      * Add meta information from product to head block.
@@ -34,7 +39,7 @@ class Soluvas_MagentoTweaks_Block_Productview extends Mage_Catalog_Block_Product
      */
     protected function _prepareLayout()
     {
-        $this->getLayout()->createBlock('catalog/breadcrumbs');
+    	$this->getLayout()->createBlock('catalog/breadcrumbs');
         $headBlock = $this->getLayout()->getBlock('head');
         if ($headBlock) {
             $product = $this->getProduct();
@@ -55,6 +60,14 @@ protected function _prepareLayout()
             } else {
                 $headBlock->setDescription($product->getDescription());
             }
+
+			$robots = $product->getMetaRobots();
+			if ($robots) {
+				$headBlock->setRobots($robots);
+            } else {
+                $headBlock->setRobots($product->getMetaRobots());
+            }
+
             if ($this->helper('catalog/product')->canUseCanonicalTag()) {
                 $params = array(/*'_ignore_category'=>true*/);
                 if (Mage::getStoreConfig('magentotweaks/catalog/fullproductpath', $this->getStoreId()) == 0)

diff --git a/...ity/Soluvas/MagentoTweaks/Helper/Data.php → ...ity/Soluvas/MagentoTweaks/Helper/Data.php b/...ity/Soluvas/MagentoTweaks/Helper/Data.php → ...ity/Soluvas/MagentoTweaks/Helper/Data.php
diff --git a/...logresourceeavmysql4productcollection.php → ...logresourceeavmysql4productcollection.php b/...logresourceeavmysql4productcollection.php → ...logresourceeavmysql4productcollection.php
diff --git a/...eavmysql4productcompareitemcollection.php → ...eavmysql4productcompareitemcollection.php b/...eavmysql4productcompareitemcollection.php → ...eavmysql4productcompareitemcollection.php
diff --git a/...y/Soluvas/MagentoTweaks/Model/Product.php → ...y/Soluvas/MagentoTweaks/Model/Product.php b/...y/Soluvas/MagentoTweaks/Model/Product.php → ...y/Soluvas/MagentoTweaks/Model/Product.php
diff --git a/...oluvas/MagentoTweaks/Model/Producturl.php → ...oluvas/MagentoTweaks/Model/Producturl.php b/...oluvas/MagentoTweaks/Model/Producturl.php → ...oluvas/MagentoTweaks/Model/Producturl.php
diff --git a/...smysql4productindexcomparedcollection.php → ...smysql4productindexcomparedcollection.php b/...smysql4productindexcomparedcollection.php → ...smysql4productindexcomparedcollection.php
diff --git a/...rtsmysql4productindexviewedcollection.php → ...rtsmysql4productindexviewedcollection.php b/...rtsmysql4productindexviewedcollection.php → ...rtsmysql4productindexviewedcollection.php
diff --git a/...y/Soluvas/MagentoTweaks/Model/Sitemap.php → ...y/Soluvas/MagentoTweaks/Model/Sitemap.php b/...y/Soluvas/MagentoTweaks/Model/Sitemap.php → ...y/Soluvas/MagentoTweaks/Model/Sitemap.php
diff --git a/...ity/Soluvas/MagentoTweaks/Sales/Quote.php → ...ity/Soluvas/MagentoTweaks/Sales/Quote.php b/...ity/Soluvas/MagentoTweaks/Sales/Quote.php → ...ity/Soluvas/MagentoTweaks/Sales/Quote.php
diff --git a/.../controllers/CatalogproductController.php → .../controllers/CatalogproductController.php b/.../controllers/CatalogproductController.php → .../controllers/CatalogproductController.php
diff --git a/...oTweaks/controllers/CmspageController.php → ...oTweaks/controllers/CmspageController.php b/...oTweaks/controllers/CmspageController.php → ...oTweaks/controllers/CmspageController.php
diff --git a/...y/Soluvas/MagentoTweaks/etc/adminhtml.xml → ...y/Soluvas/MagentoTweaks/etc/adminhtml.xml b/...y/Soluvas/MagentoTweaks/etc/adminhtml.xml → ...y/Soluvas/MagentoTweaks/etc/adminhtml.xml
diff --git a/...nity/Soluvas/MagentoTweaks/etc/config.xml → ...nity/Soluvas/MagentoTweaks/etc/config.xml b/...nity/Soluvas/MagentoTweaks/etc/config.xml → ...nity/Soluvas/MagentoTweaks/etc/config.xml
diff --git a/...nity/Soluvas/MagentoTweaks/etc/system.xml → ...nity/Soluvas/MagentoTweaks/etc/system.xml b/...nity/Soluvas/MagentoTweaks/etc/system.xml → ...nity/Soluvas/MagentoTweaks/etc/system.xml
diff --git a/app/etc/modules/Soluvas_MagentoTweaks.xml b/app/etc/modules/Soluvas_MagentoTweaks.xml
@@ -21,6 +21,10 @@
         <Soluvas_MagentoTweaks>
             <active>true</active>
             <codePool>community</codePool>
+			<!-- WARNING: FIXME: Depend on Yoast_MetaRobots to resolve conflict!!! -->
+			<depends>
+				<Yoast_MetaRobots />
+			</depends>
         </Soluvas_MagentoTweaks>
     </modules>
 </config>