Revert "#3427 - parse description (progress)"

This reverts commit f0b8ad5.
cubecart · Mar 14, 2024 · 9237e0d · 9237e0d
1 parent 75ec441
commit 9237e0d
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 8 deletions.
diff --git a/admin/skins/default/templates/products.index.php b/admin/skins/default/templates/products.index.php
@@ -260,9 +260,6 @@
    </div>
    <div id="description" class="tab_content">
       <h3>{$LANG.common.description}</h3>
-      <div>
-         <label for="product_parse">{$LANG.catalogue.product_parse}</label><span><input type="hidden" name="product_parse" id="product_parse" class="toggle" value="{$PRODUCT.product_parse}"></span>
-      </div>
       <textarea name="description" class="textbox fck">{if $PRODUCT.description}{htmlentities($PRODUCT.description, ENT_QUOTES, 'UTF-8', true)}{/if}</textarea>
       <br>
       <h3>{$LANG.common.description_short} {$LANG.common.optional}</h3>

diff --git a/classes/catalogue.class.php b/classes/catalogue.class.php
@@ -1119,7 +1119,6 @@ public function getProductData($product_id, $quantity = 1, $order = false, $per_
             foreach ($result as $product) {
                 $product['product_weight'] = (float)$product['product_weight'];
                 $GLOBALS['language']->translateProduct($product);
-                $product['description'] = ($product['product_parse']==1) ? $GLOBALS['smarty']->fetch('string:'.$product['description']) : $product['description'];
                 $this->getProductPrice($product, $quantity);
                 if (!$category && $count == 1) {
                     $data = $product;

diff --git a/language/definitions.xml b/language/definitions.xml
@@ -243,7 +243,6 @@
     <string name="your_comments" introduced="5.0.0"><![CDATA[Delivery Notes or Additional Comments]]></string>
   </group>
   <group name="catalogue">
-    <string name="product_parse" introduced="6.5.4"><![CDATA[Parse Smarty Tags in Description]]></string>
     <string name="product_not_found" introduced="6.5.2"><![CDATA[Product not found.]]></string>
     <string name="product_count" introduced="6.5.2"><![CDATA[Product Count]]></string>
     <string name="option_type_password" introduced="6.4.11"><![CDATA[Password]]></string>

diff --git a/setup/db/install/structure.sql b/setup/db/install/structure.sql
@@ -491,7 +491,6 @@ CREATE TABLE IF NOT EXISTS `CubeCart_inventory` (
   `available` enum('0','1') NOT NULL DEFAULT '1',
   `minimum_quantity` INT(10) NOT NULL DEFAULT '1',
   `maximum_quantity` INT(10) NOT NULL DEFAULT '0',
-  `product_parse` tinyint(1) unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (`product_id`),
   KEY `status` (`status`),
   KEY `live_from` (`live_from`),

diff --git a/setup/db/upgrade/6.5.4.sql b/setup/db/upgrade/6.5.4.sql
@@ -20,5 +20,4 @@ ALTER TABLE `CubeCart_admin_users` CHANGE `email` `email` VARCHAR(96); #EOQ
 ALTER TABLE `CubeCart_category_language` CHANGE `cat_desc` `cat_desc` TEXT NULL DEFAULT NULL; #EOQ
 ALTER TABLE `CubeCart_inventory` CHANGE `maximum_quantity` `maximum_quantity` INT NULL DEFAULT '0'; #EOQ
 ALTER TABLE `CubeCart_order_summary` ADD `updated` TIMESTAMP on update CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP; #EOQ
-ALTER TABLE `CubeCart_admin_log` CHANGE `item_id` `item_id` VARCHAR(255) NULL DEFAULT NULL; #EOQ
-ALTER TABLE `CubeCart_inventory` ADD `product_parse` INT UNSIGNED NOT NULL DEFAULT '0'; #EOQ
+ALTER TABLE `CubeCart_admin_log` CHANGE `item_id` `item_id` VARCHAR(255) NULL DEFAULT NULL; #EOQ