=== modified file 'uc_attribute/uc_attribute.module'
--- uc_attribute/uc_attribute.module 2008-12-31 15:43:50 +0000
+++ uc_attribute/uc_attribute.module 2009-01-09 02:32:34 +0000
@@ -242,7 +242,7 @@
function uc_attribute_form_alter(&$form, &$form_state, $form_id) {
if (strpos($form_id, 'add_to_cart_form') || strpos($form_id, 'add_product_form')) {
// If the node has a product list, add attributes to them
- if (count(element_children($form['products']))) {
+ if (isset($form['products']) && count(element_children($form['products']))) {
foreach (element_children($form['products']) as $key) {
$form['products'][$key]['attributes'] = _uc_attribute_alter_form(node_load($key));
if (is_array($form['products'][$key]['attributes'])) {
=== modified file 'uc_order/uc_order.module'
--- uc_order/uc_order.module 2009-01-08 04:32:17 +0000
+++ uc_order/uc_order.module 2009-01-09 02:32:34 +0000
@@ -340,6 +340,7 @@
* Implementation of hook_token_values(). (token.module)
*/
function uc_order_token_values($type, $object = NULL) {
+ $values = array();
switch ($type) {
case 'order':
$order = $object;
@@ -402,6 +403,7 @@
* Implementation of hook_token_list(). (token.module)
*/
function uc_order_token_list($type = 'all') {
+ $tokens = array();
if ($type == 'order' || $type == 'ubercart' || $type == 'all') {
$tokens['order']['new-username'] = t('New username associated with an order if applicable.');
$tokens['order']['new-password'] = t('New password associated with an order if applicable.');
=== modified file 'uc_product/uc_product.admin.inc'
--- uc_product/uc_product.admin.inc 2009-01-02 16:03:40 +0000
+++ uc_product/uc_product.admin.inc 2009-01-09 02:34:07 +0000
@@ -10,6 +10,8 @@
* List all products.
*/
function uc_product_administration() {
+ $output = '';
+
$header = array();
$tbl_columns = uc_product_table_header();
foreach ($tbl_columns as $column) {
@@ -564,11 +566,15 @@
* @see uc_product_class_form_submit()
*/
function uc_product_class_form($form_state, $class = NULL) {
- if ($class) {
- drupal_set_title(check_plain($class->name));
+ if (!is_null($class)) {
+ $classname = $class->name;
+ $classdesc = $class->description;
+ drupal_set_title(check_plain($classname));
$form['pcid'] = array('#type' => 'hidden', '#value' => $class->pcid);
}
else {
+ $classname = '';
+ $classdesc = '';
$form['pcid'] = array('#type' => 'textfield',
'#title' => t('Class ID'),
'#required' => TRUE,
@@ -579,14 +585,14 @@
$form['name'] = array(
'#type' => 'textfield',
'#title' => t('Class name'),
- '#default_value' => $class->name,
+ '#default_value' => $classname,
'#required' => TRUE,
);
$form['description'] = array(
'#type' => 'textarea',
'#title' => t('Description'),
'#description' => t('This text describes the content type created for this product class to administrators.'),
- '#default_value' => $class->description,
+ '#default_value' => $classdesc,
);
$form['submit'] = array(
'#type' => 'submit',
=== modified file 'uc_product/uc_product.module'
--- uc_product/uc_product.module 2009-01-02 15:02:45 +0000
+++ uc_product/uc_product.module 2009-01-09 02:36:14 +0000
@@ -162,9 +162,10 @@
*/
function uc_product_help($path, $arg) {
// Do things here later. Figure out what you need to say for each section.
+ $output = '';
switch ($path) {
case 'admin/settings/module#description':
- $output = t('Create products for sale in an online store.');
+ $output .= t('Create products for sale in an online store.');
break;
default:
$output = '';
@@ -474,7 +475,7 @@
$form['base']['model'] = array('#type' => 'textfield',
'#title' => t('SKU'),
'#required' => TRUE,
- '#default_value' => $node->model,
+ '#default_value' => isset($node->model) ? $node->model : '',
'#description' => t('Product SKU/model.'),
'#weight' => 0,
'#size' => 32,
@@ -489,7 +490,7 @@
'#type' => 'textfield',
'#title' => t('List price'),
'#required' => FALSE,
- '#default_value' => $node->list_price,
+ '#default_value' => isset($node->list_price) ? $node->list_price : 0,
'#description' => t('The listed MSRP.'),
'#weight' => 0,
'#size' => 20,
@@ -501,7 +502,7 @@
'#type' => 'textfield',
'#title' => t('Cost'),
'#required' => FALSE,
- '#default_value' => $node->cost,
+ '#default_value' => isset($node->cost) ? $node->cost : 0,
'#description' => t("Your store's cost."),
'#weight' => 1,
'#size' => 20,
@@ -513,7 +514,7 @@
'#type' => 'textfield',
'#title' => t('Sell price'),
'#required' => TRUE,
- '#default_value' => $node->sell_price,
+ '#default_value' => isset($node->sell_price) ? $node->sell_price : 0,
'#description' => t('Customer purchase price.'),
'#weight' => 2,
'#size' => 20,
@@ -535,7 +536,7 @@
);
$form['base']['weight']['weight'] = array('#type' => 'textfield',
'#title' => t('Weight'),
- '#default_value' => $node->weight,
+ '#default_value' => isset($node->weight) ? $node->weight : 0,
'#size' => 10,
'#maxlength' => 15,
);
@@ -547,7 +548,7 @@
);
$form['base']['weight']['weight_units'] = array('#type' => 'select',
'#title' => t('Unit of measurement'),
- '#default_value' => $node->weight_units ? $node->weight_units : variable_get('uc_weight_unit', 'lb'),
+ '#default_value' => isset($node->weight_units) ? $node->weight_units : variable_get('uc_weight_unit', 'lb'),
'#options' => $units,
);
$form['base']['dimensions'] = array('#type' => 'fieldset',
@@ -564,32 +565,32 @@
'cm' => t('Centimeters'),
'mm' => t('Millimeters'),
),
- '#default_value' => $node->length_units ? $node->length_units : variable_get('uc_length_unit', 'in'),
+ '#default_value' => isset($node->length_units) ? $node->length_units : variable_get('uc_length_unit', 'in'),
);
$form['base']['dimensions']['length'] = array('#type' => 'textfield',
'#title' => t('Length'),
- '#default_value' => $node->length,
+ '#default_value' => isset($node->length) ? $node->length : '',
'#size' => 10,
);
$form['base']['dimensions']['width'] = array('#type' => 'textfield',
'#title' => t('Width'),
- '#default_value' => $node->width,
+ '#default_value' => isset($node->width) ? $node->width : '',
'#size' => 10,
);
$form['base']['dimensions']['height'] = array('#type' => 'textfield',
'#title' => t('Height'),
- '#default_value' => $node->height,
+ '#default_value' => isset($node->height) ? $node->height : '',
'#size' => 10,
);
$form['base']['pkg_qty'] = array('#type' => 'textfield',
'#title' => t('Package quantity'),
- '#default_value' => $node->pkg_qty ? $node->pkg_qty : 1,
+ '#default_value' => isset($node->pkg_qty) ? $node->pkg_qty : 1,
'#description' => t('For a package containing only this product, how many are in it?'),
'#weight' => 25,
);
$form['base']['default_qty'] = array('#type' => 'textfield',
'#title' => t('Default quantity to add to cart'),
- '#default_value' => !is_null($node->default_qty) ? $node->default_qty : 1,
+ '#default_value' => isset($node->default_qty) ? $node->default_qty : 1,
'#description' => t('Leave blank or zero to disable the quantity field next to the add to cart button, if it is enabled in general. If it is disabled, this field is ignored.', array('!settings_url' => url('admin/store/settings/products/edit'))),
'#weight' => 27,
'#size' => 5,
@@ -1408,8 +1409,10 @@
// Get the current product image widget.
$image_widget = uc_product_get_image_widget();
$image_widget_func = $image_widget['callback'];
+ $image_defaults = array('filepath' => '','alt' => '','title' => '');
- $first = array_shift($images);
+ $first = array_merge($image_defaults, array_shift($images));
+
$output = '