# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
Index: contributions/modules/ubercart/uc_attribute/uc_attribute.module
--- contributions/modules/ubercart/uc_attribute/uc_attribute.module Base (1.29)
+++ contributions/modules/ubercart/uc_attribute/uc_attribute.module Modifié localement (basé sur 1.29)
@@ -618,7 +618,7 @@
   if ($nid) {
     switch ($type) {
       case 'product':
-        $attribute = db_query("SELECT a.aid, a.name, a.label AS default_label, a.ordering AS default_ordering, a.required AS default_required, a.display AS default_display, a.description, pa.label, pa.default_option, pa.required, pa.ordering, pa.display FROM {uc_attributes} AS a LEFT JOIN {uc_product_attributes} AS pa ON a.aid = pa.aid AND pa.nid = :nid WHERE a.aid = :aid", array(':nid' => $nid, ':aid' => $attr_id))->fetchObject();
+        $attribute = db_query("SELECT a.aid, a.name, a.label AS default_label, a.ordering AS default_ordering, a.format, a.required AS default_required, a.display AS default_display, a.description, pa.label, pa.default_option, pa.required, pa.ordering, pa.display FROM {uc_attributes} AS a LEFT JOIN {uc_product_attributes} AS pa ON a.aid = pa.aid AND pa.nid = :nid WHERE a.aid = :aid", array(':nid' => $nid, ':aid' => $attr_id))->fetchObject();
         $result = db_query("SELECT po.nid, po.oid, po.cost, po.price, po.weight, po.ordering, ao.name, ao.aid FROM {uc_product_options} AS po LEFT JOIN {uc_attribute_options} AS ao ON po.oid = ao.oid AND nid = :nid WHERE aid = :aid ORDER BY po.ordering, ao.name", array(':nid' => $nid, ':aid' => $attr_id));
         break;
       case 'class':
@@ -805,7 +805,7 @@
         if ($attribute->display == 1) {
           $options = array('' => t('Please select')) + $options;
         }
-        unset($attribute->default_option);
+        $attribute->default_option = NULL;
       }
       switch ($attribute->display) {
         case 1: