+ */
+class Mage_Wishlist_Block_Customer_Wishlist_Button extends Mage_Core_Block_Template
{
/**
- * Get Shipping Methods
+ * Retrieve current wishlist
*
- * @return array
+ * @return Mage_Wishlist_Model_Wishlist
*/
- public function toOptionArray()
+ public function getWishlist()
{
- $dhl = Mage::getSingleton('usa/shipping_carrier_dhl_international');
- $arr = array();
- foreach ($dhl->getDhlProducts() as $code => $title) {
- $arr[] = array('value' => $code, 'label' => $title);
- }
- return $arr;
+ return Mage::helper('wishlist')->getWishlist();
}
}
diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column.php
new file mode 100644
index 0000000000..bfc8f8d98d
--- /dev/null
+++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column.php
@@ -0,0 +1,84 @@
+
+ */
+class Mage_Wishlist_Block_Customer_Wishlist_Item_Column extends Mage_Wishlist_Block_Abstract
+{
+ /**
+ * Checks whether column should be shown in table
+ *
+ * @return bool
+ */
+ public function isEnabled()
+ {
+ return true;
+ }
+
+ /**
+ * Retrieve block html
+ *
+ * @return string
+ */
+ protected function _toHtml()
+ {
+ if ($this->isEnabled()) {
+ return parent::_toHtml();
+ }
+ return '';
+ }
+
+ /**
+ * Retrieve child blocks html
+ *
+ * @param string $name
+ * @param Mage_Core_Block_Abstract $child
+ * @return string
+ */
+ protected function _beforeChildToHtml($name, $child)
+ {
+ $child->setItem($this->getItem());
+ }
+
+ /**
+ * Retrieve column related javascript code
+ *
+ * @return string
+ */
+ public function getJs()
+ {
+ $js = '';
+ foreach ($this->getSortedChildBlocks() as $child) {
+ $js .= $child->getJs();
+ }
+ return $js;
+ }
+}
diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php
new file mode 100644
index 0000000000..f7d8cdc7de
--- /dev/null
+++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php
@@ -0,0 +1,74 @@
+
+ */
+class Mage_Wishlist_Block_Customer_Wishlist_Item_Column_Cart extends Mage_Wishlist_Block_Customer_Wishlist_Item_Column
+{
+ /**
+ * Returns qty to show visually to user
+ *
+ * @param Mage_Wishlist_Model_Item $item
+ * @return float
+ */
+ public function getAddToCartQty(Mage_Wishlist_Model_Item $item)
+ {
+ $qty = $item->getQty();
+ return $qty ? $qty : 1;
+ }
+
+ /**
+ * Retrieve column related javascript code
+ *
+ * @return string
+ */
+ public function getJs()
+ {
+ $js = "
+ function addWItemToCart(itemId) {
+ var url = '" . $this->getItemAddToCartUrl('%item%') . "';
+ url = url.gsub('%item%', itemId);
+ var form = $('wishlist-view-form');
+ if (form) {
+ var input = form['qty[' + itemId + ']'];
+ if (input) {
+ var separator = (url.indexOf('?') >= 0) ? '&' : '?';
+ url += separator + input.name + '=' + encodeURIComponent(input.value);
+ }
+ }
+ setLocation(url);
+ }
+ ";
+
+ $js .= parent::getJs();
+ return $js;
+ }
+}
diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
new file mode 100644
index 0000000000..4e007a1f3a
--- /dev/null
+++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
@@ -0,0 +1,54 @@
+
+ */
+class Mage_Wishlist_Block_Customer_Wishlist_Item_Column_Comment
+ extends Mage_Wishlist_Block_Customer_Wishlist_Item_Column
+{
+ /**
+ * Retrieve column javascript code
+ *
+ * @return string
+ */
+ public function getJs()
+ {
+ return parent::getJs() . "
+ function focusComment(obj) {
+ if( obj.value == '" . $this->helper('wishlist')->defaultCommentString() . "' ) {
+ obj.value = '';
+ } else if( obj.value == '' ) {
+ obj.value = '" . $this->helper('wishlist')->defaultCommentString() . "';
+ }
+ }
+ ";
+ }
+}
diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php
new file mode 100644
index 0000000000..1804c269d2
--- /dev/null
+++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php
@@ -0,0 +1,36 @@
+
+ */
+class Mage_Wishlist_Block_Customer_Wishlist_Item_Column_Image extends Mage_Wishlist_Block_Customer_Wishlist_Item_Column
+{
+}
diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
new file mode 100644
index 0000000000..25dd0b517a
--- /dev/null
+++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
@@ -0,0 +1,49 @@
+
+ */
+class Mage_Wishlist_Block_Customer_Wishlist_Item_Column_Remove extends Mage_Wishlist_Block_Customer_Wishlist_Item_Column
+{
+ /**
+ * Retrieve block javascript
+ *
+ * @return string
+ */
+ public function getJs()
+ {
+ return parent::getJs() . "
+ function confirmRemoveWishlistItem() {
+ return confirm('" . $this->__('Are you sure you want to remove this product from your wishlist?') . "');
+ }
+ ";
+ }
+}
diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php
index 0e07231d41..8dc5d0be07 100644
--- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php
+++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -33,4 +33,85 @@
*/
class Mage_Wishlist_Block_Customer_Wishlist_Item_Options extends Mage_Wishlist_Block_Abstract
{
+ /*
+ * List of product options rendering configurations by product type
+ *
+ * @var array
+ */
+ protected $_optionsCfg = array('default' => array(
+ 'helper' => 'catalog/product_configuration',
+ 'template' => 'wishlist/options_list.phtml'
+ ));
+
+ /**
+ * Initialize block
+ */
+ public function __construct()
+ {
+ parent::__construct();
+ Mage::dispatchEvent('product_option_renderer_init', array('block' => $this));
+ }
+
+ /*
+ * Adds config for rendering product type options
+ *
+ * @param string $productType
+ * @param string $helperName
+ * @param null|string $template
+ * @return Mage_Wishlist_Block_Customer_Wishlist_Item_Options
+ */
+ public function addOptionsRenderCfg($productType, $helperName, $template = null)
+ {
+ $this->_optionsCfg[$productType] = array('helper' => $helperName, 'template' => $template);
+ return $this;
+ }
+
+ /**
+ * Get item options renderer config
+ *
+ * @param string $productType
+ * @return array|null
+ */
+ public function getOptionsRenderCfg($productType)
+ {
+ if (isset($this->_optionsCfg[$productType])) {
+ return $this->_optionsCfg[$productType];
+ } elseif (isset($this->_optionsCfg['default'])) {
+ return $this->_optionsCfg['default'];
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * Render block html
+ *
+ * @return string
+ */
+ protected function _toHtml()
+ {
+ $cfg = $this->getOptionsRenderCfg($this->getItem()->getProduct()->getTypeId());
+ if (!$cfg) {
+ return '';
+ }
+
+ $helper = Mage::helper($cfg['helper']);
+ if (!($helper instanceof Mage_Catalog_Helper_Product_Configuration_Interface)) {
+ Mage::throwException($this->__("Helper for wishlist options rendering doesn't implement required interface."));
+ }
+
+ if ($cfg['template']) {
+ $template = $cfg['template'];
+ } else {
+ $cfgDefault = $this->getOptionsRenderCfg('default');
+ if (!$cfgDefault) {
+ return '';
+ }
+ $template = $cfgDefault['template'];
+ }
+
+ $this->setTemplate($template)
+ ->setOptionList($helper->getOptions($this->getItem()));
+ return parent::_toHtml();
+ }
}
diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Items.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Items.php
new file mode 100644
index 0000000000..f3ca9ada76
--- /dev/null
+++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Items.php
@@ -0,0 +1,52 @@
+
+ */
+class Mage_Wishlist_Block_Customer_Wishlist_Items extends Mage_Core_Block_Template
+{
+ /**
+ * Retreive table column object list
+ *
+ * @return array
+ */
+ public function getColumns()
+ {
+ $columns = array();
+ foreach ($this->getSortedChildren() as $code) {
+ $child = $this->getChild($code);
+ if ($child->isEnabled()){
+ $columns[] = $child;
+ }
+ }
+ return $columns;
+ }
+}
diff --git a/app/code/core/Mage/Wishlist/Block/Item/Configure.php b/app/code/core/Mage/Wishlist/Block/Item/Configure.php
index d83e9cbd4d..2b7835404f 100644
--- a/app/code/core/Mage/Wishlist/Block/Item/Configure.php
+++ b/app/code/core/Mage/Wishlist/Block/Item/Configure.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Block/Links.php b/app/code/core/Mage/Wishlist/Block/Links.php
index c30c797d93..f1d15d753d 100644
--- a/app/code/core/Mage/Wishlist/Block/Links.php
+++ b/app/code/core/Mage/Wishlist/Block/Links.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -41,31 +41,57 @@ class Mage_Wishlist_Block_Links extends Mage_Page_Block_Template_Links_Block
protected $_position = 30;
/**
- * Set link title, label and url
+ * @return string
*/
- public function __construct()
+ protected function _toHtml()
{
- parent::__construct();
- $this->initLinkProperties();
+ if ($this->helper('wishlist')->isAllow()) {
+ $text = $this->_createLabel($this->_getItemCount());
+ $this->_label = $text;
+ $this->_title = $text;
+ $this->_url = $this->getUrl('wishlist');
+ return parent::_toHtml();
+ }
+ return '';
}
/**
* Define label, title and url for wishlist link
+ *
+ * @deprecated after 1.6.2.0
*/
public function initLinkProperties()
{
- if ($this->helper('wishlist')->isAllow()) {
- $count = $this->getItemCount() ? $this->getItemCount() : $this->helper('wishlist')->getItemCount();
- if ($count > 1) {
- $text = $this->__('My Wishlist (%d items)', $count);
- } else if ($count == 1) {
- $text = $this->__('My Wishlist (%d item)', $count);
- } else {
- $text = $this->__('My Wishlist');
- }
- $this->_label = $text;
- $this->_title = $text;
- $this->_url = $this->getUrl('wishlist');
+ $text = $this->_createLabel($this->_getItemCount());
+ $this->_label = $text;
+ $this->_title = $text;
+ $this->_url = $this->getUrl('wishlist');
+ }
+
+ /**
+ * Count items in wishlist
+ *
+ * @return int
+ */
+ protected function _getItemCount()
+ {
+ return $this->helper('wishlist')->getItemCount();
+ }
+
+ /**
+ * Create button label based on wishlist item quantity
+ *
+ * @param int $count
+ * @return string
+ */
+ protected function _createLabel($count)
+ {
+ if ($count > 1) {
+ return $this->__('My Wishlist (%d items)', $count);
+ } else if ($count == 1) {
+ return $this->__('My Wishlist (%d item)', $count);
+ } else {
+ return $this->__('My Wishlist');
}
}
diff --git a/app/code/core/Mage/Wishlist/Block/Render/Item/Price.php b/app/code/core/Mage/Wishlist/Block/Render/Item/Price.php
index 0d0cd9ff96..922d80b90e 100644
--- a/app/code/core/Mage/Wishlist/Block/Render/Item/Price.php
+++ b/app/code/core/Mage/Wishlist/Block/Render/Item/Price.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php b/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php
index 1b60b3cf0e..eaf01c9220 100644
--- a/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php
+++ b/app/code/core/Mage/Wishlist/Block/Share/Email/Items.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Block/Share/Email/Rss.php b/app/code/core/Mage/Wishlist/Block/Share/Email/Rss.php
index a2bbf166f1..f3f6f14ca3 100644
--- a/app/code/core/Mage/Wishlist/Block/Share/Email/Rss.php
+++ b/app/code/core/Mage/Wishlist/Block/Share/Email/Rss.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php b/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php
index c09ef2f5cc..a5289db9e3 100644
--- a/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php
+++ b/app/code/core/Mage/Wishlist/Block/Share/Wishlist.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Controller/Abstract.php b/app/code/core/Mage/Wishlist/Controller/Abstract.php
index aa040888c4..ee1d08ba57 100644
--- a/app/code/core/Mage/Wishlist/Controller/Abstract.php
+++ b/app/code/core/Mage/Wishlist/Controller/Abstract.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -49,9 +49,11 @@ abstract class Mage_Wishlist_Controller_Abstract extends Mage_Core_Controller_Fr
protected function _processLocalizedQty($qty)
{
if (!$this->_localFilter) {
- $this->_localFilter = new Zend_Filter_LocalizedToNormalized(array('locale' => Mage::app()->getLocale()->getLocaleCode()));
+ $this->_localFilter = new Zend_Filter_LocalizedToNormalized(
+ array('locale' => Mage::app()->getLocale()->getLocaleCode())
+ );
}
- $qty = $this->_localFilter->filter($qty);
+ $qty = $this->_localFilter->filter((float)$qty);
if ($qty < 0) {
$qty = null;
}
@@ -91,6 +93,7 @@ public function allcartAction()
foreach ($collection as $item) {
/** @var Mage_Wishlist_Model_Item */
try {
+ $disableAddToCart = $item->getProduct()->getDisableAddToCart();
$item->unsProduct();
// Set qty
@@ -100,7 +103,7 @@ public function allcartAction()
$item->setQty($qty);
}
}
-
+ $item->getProduct()->setDisableAddToCart($disableAddToCart);
// Add to cart
if ($item->addToCart($cart, $isOwner)) {
$addedItems[] = $item->getProduct();
@@ -121,7 +124,7 @@ public function allcartAction()
}
if ($isOwner) {
- $indexUrl = Mage::helper('wishlist')->getListUrl();
+ $indexUrl = Mage::helper('wishlist')->getListUrl($wishlist->getId());
} else {
$indexUrl = Mage::getUrl('wishlist/shared', array('code' => $wishlist->getSharingCode()));
}
diff --git a/app/code/core/Mage/Wishlist/Helper/Data.php b/app/code/core/Mage/Wishlist/Helper/Data.php
index 3940e0d83b..93a1e7f1d8 100644
--- a/app/code/core/Mage/Wishlist/Helper/Data.php
+++ b/app/code/core/Mage/Wishlist/Helper/Data.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -44,6 +44,13 @@ class Mage_Wishlist_Helper_Data extends Mage_Core_Helper_Abstract
*/
const XML_PATH_CATALOGINVENTORY_SHOW_OUT_OF_STOCK = 'cataloginventory/options/show_out_of_stock';
+ /**
+ * Currently logged in customer
+ *
+ * @var Mage_Customer_Model_Customer
+ */
+ protected $_currentCustomer = null;
+
/**
* Customer Wishlist instance
*
@@ -61,7 +68,7 @@ class Mage_Wishlist_Helper_Data extends Mage_Core_Helper_Abstract
/**
* Wishlist Items Collection
*
- * @var Mage_Wishlist_Model_Mysql4_Item_Collection
+ * @var Mage_Wishlist_Model_Resource_Item_Collection
*/
protected $_wishlistItemCollection = null;
@@ -92,7 +99,30 @@ protected function _isCustomerLogIn()
*/
protected function _getCurrentCustomer()
{
- return $this->_getCustomerSession()->getCustomer();
+ return $this->getCustomer();
+ }
+
+ /**
+ * Set current customer
+ *
+ * @param Mage_Customer_Model_Customer $customer
+ */
+ public function setCustomer(Mage_Customer_Model_Customer $customer)
+ {
+ $this->_currentCustomer = $customer;
+ }
+
+ /**
+ * Retrieve current customer
+ *
+ * @return Mage_Customer_Model_Customer|null
+ */
+ public function getCustomer()
+ {
+ if (!$this->_currentCustomer && $this->_getCustomerSession()->isLoggedIn()) {
+ $this->_currentCustomer = $this->_getCustomerSession()->getCustomer();
+ }
+ return $this->_currentCustomer;
}
/**
@@ -111,8 +141,8 @@ public function getWishlist()
}
else {
$this->_wishlist = Mage::getModel('wishlist/wishlist');
- if ($this->_getCustomerSession()->isLoggedIn()) {
- $this->_wishlist->loadByCustomer($this->_getCustomerSession()->getCustomer());
+ if ($this->getCustomer()) {
+ $this->_wishlist->loadByCustomer($this->getCustomer());
}
}
}
@@ -169,22 +199,29 @@ public function getItemCollection()
return $this->getProductCollection();
}
+ /**
+ * Create wishlist item collection
+ *
+ * @return Mage_Wishlist_Model_Resource_Item_Collection
+ */
+ protected function _createWishlistItemCollection()
+ {
+ return $this->getWishlist()->getItemCollection();
+ }
/**
* Retrieve wishlist items collection
*
- * @return Mage_Wishlist_Model_Mysql4_Item_Collection
+ * @return Mage_Wishlist_Model_Resource_Item_Collection
*/
public function getWishlistItemCollection()
{
if (is_null($this->_wishlistItemCollection)) {
- $this->_wishlistItemCollection = $this->getWishlist()
- ->getItemCollection();
+ $this->_wishlistItemCollection = $this->_createWishlistItemCollection();
}
return $this->_wishlistItemCollection;
}
-
/**
* Retrieve wishlist product items collection
*
@@ -269,6 +306,18 @@ public function getAddUrl($item)
return $this->getAddUrlWithParams($item);
}
+ /**
+ * Retrieve url for adding product to wishlist
+ *
+ * @param int $itemId
+ *
+ * @return string
+ */
+ public function getMoveFromCartUrl($itemId)
+ {
+ return $this->_getUrl('wishlist/index/fromcart', array('item' => $itemId));
+ }
+
/**
* Retrieve url for updating product in wishlist
*
@@ -287,8 +336,7 @@ public function getUpdateUrl($item)
}
if ($itemId) {
- $params['id'] = $itemId;
- return $this->_getUrlStore($item)->getUrl('wishlist/index/updateItemOptions', $params);
+ return $this->_getUrl('wishlist/index/updateItemOptions', array('id' => $itemId));
}
return false;
@@ -382,11 +430,16 @@ public function getAddToCartUrlBase64($item)
/**
* Retrieve customer wishlist url
*
+ * @param int $wishlistId
* @return string
*/
- public function getListUrl()
+ public function getListUrl($wishlistId = null)
{
- return $this->_getUrl('wishlist');
+ $params = array();
+ if ($wishlistId) {
+ $params['wishlist_id'] = $wishlistId;
+ }
+ return $this->_getUrl('wishlist', $params);
}
/**
@@ -409,34 +462,44 @@ public function isAllow()
*/
public function isAllowInCart()
{
- return $this->isAllow() && $this->_isCustomerLogIn();
+ return $this->isAllow() && $this->getCustomer();
}
/**
* Retrieve customer name
*
- * @return string
+ * @return string|null
*/
public function getCustomerName()
{
- return $this->_getCurrentCustomer()->getName();
+ $customer = $this->_getCurrentCustomer();
+ if ($customer) {
+ return $customer->getName();
+ }
}
/**
* Retrieve RSS URL
*
+ * @param $wishlistId
* @return string
*/
- public function getRssUrl()
+ public function getRssUrl($wishlistId = null)
{
$customer = $this->_getCurrentCustomer();
- $key = $customer->getId().','.$customer->getEmail();
+ if ($customer) {
+ $key = $customer->getId() . ',' . $customer->getEmail();
+ $params = array(
+ 'data' => Mage::helper('core')->urlEncode($key),
+ '_secure' => false,
+ );
+ }
+ if ($wishlistId) {
+ $params['wishlist_id'] = $wishlistId;
+ }
return $this->_getUrl(
'rss/index/wishlist',
- array(
- 'data' => Mage::helper('core')->urlEncode($key),
- '_secure' => false
- )
+ $params
);
}
@@ -460,6 +523,16 @@ public function defaultCommentString()
return $this->__('Please, enter your comments...');
}
+ /**
+ * Retrieve default empty comment message
+ *
+ * @return string
+ */
+ public function getDefaultWishlistName()
+ {
+ return $this->__('Wishlist');
+ }
+
/**
* Calculate count of wishlist items and put value to customer session.
* Method called after wishlist modifications and trigger 'wishlist_items_renewed' event.
@@ -471,7 +544,7 @@ public function calculate()
{
$session = $this->_getCustomerSession();
$count = 0;
- if ($this->_isCustomerLogIn()) {
+ if ($this->getCustomer()) {
$collection = $this->getWishlistItemCollection()->setInStockFilter(true);
if (Mage::getStoreConfig(self::XML_PATH_WISHLIST_LINK_USE_QTY)) {
$count = $collection->getItemsQty();
@@ -487,4 +560,14 @@ public function calculate()
Mage::dispatchEvent('wishlist_items_renewed');
return $this;
}
+
+ /**
+ * Should display item quantities in my wishlist link
+ *
+ * @return bool
+ */
+ public function isDisplayQty()
+ {
+ return Mage::getStoreConfig(self::XML_PATH_WISHLIST_LINK_USE_QTY);
+ }
}
diff --git a/app/code/core/Mage/Wishlist/Model/Config.php b/app/code/core/Mage/Wishlist/Model/Config.php
index 9c8c7d30c6..dd1c5510e5 100644
--- a/app/code/core/Mage/Wishlist/Model/Config.php
+++ b/app/code/core/Mage/Wishlist/Model/Config.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Model/Config/Source/Summary.php b/app/code/core/Mage/Wishlist/Model/Config/Source/Summary.php
index 7765170c63..78f24857fd 100644
--- a/app/code/core/Mage/Wishlist/Model/Config/Source/Summary.php
+++ b/app/code/core/Mage/Wishlist/Model/Config/Source/Summary.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Mage_Wishlist_Model_Config_Source_Summary
diff --git a/app/code/core/Mage/Wishlist/Model/Item.php b/app/code/core/Mage/Wishlist/Model/Item.php
index 9f21df760c..a4b1458467 100644
--- a/app/code/core/Mage/Wishlist/Model/Item.php
+++ b/app/code/core/Mage/Wishlist/Model/Item.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -50,7 +50,13 @@ class Mage_Wishlist_Model_Item extends Mage_Core_Model_Abstract
{
const EXCEPTION_CODE_NOT_SALABLE = 901;
const EXCEPTION_CODE_HAS_REQUIRED_OPTIONS = 902;
- const EXCEPTION_CODE_IS_GROUPED_PRODUCT = 903; // deprecated after 1.4.2.0, because we can store product configuration and add grouped products
+ /**
+ * We can store product store product configuration
+ * and add grouped attributes after 1.4.2.0
+ *
+ * @deprecated after 1.4.2.0
+ */
+ const EXCEPTION_CODE_IS_GROUPED_PRODUCT = 903;
/**
* Custom path to download attached file
@@ -110,6 +116,18 @@ protected function _construct()
$this->_init('wishlist/item');
}
+ /**
+ * Set quantity. If quantity is less than 0 - set it to 1
+ *
+ * @param int $qty
+ * @return Mage_Wishlist_Model_Item
+ */
+ public function setQty($qty)
+ {
+ $this->setData('qty', ($qty >= 0) ? $qty : 1 );
+ return $this;
+ }
+
/**
* Retrieve resource instance wrapper
*
diff --git a/app/code/core/Mage/Wishlist/Model/Item/Option.php b/app/code/core/Mage/Wishlist/Model/Item/Option.php
index 209f8a1a27..9b35dbf3de 100644
--- a/app/code/core/Mage/Wishlist/Model/Item/Option.php
+++ b/app/code/core/Mage/Wishlist/Model/Item/Option.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php
index 3b3cb93f7d..4730e66a70 100644
--- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php
+++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Item.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php
index 5e17ef1b33..ea9242c84f 100644
--- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php
+++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php
index 0857fd2580..63e41f9827 100644
--- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php
+++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php
index 849b93318c..a2eb00b61d 100644
--- a/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php
+++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Item/Option/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php
index cd3abea11f..6765fd29b4 100644
--- a/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php
+++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Product/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php
index 1757a613eb..32dd6ae7d7 100644
--- a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php
+++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php
index 3d557c78ad..5fed31be3d 100644
--- a/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php
+++ b/app/code/core/Mage/Wishlist/Model/Mysql4/Wishlist/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Model/Observer.php b/app/code/core/Mage/Wishlist/Model/Observer.php
index 71fea8aea4..c5f4d5766d 100644
--- a/app/code/core/Mage/Wishlist/Model/Observer.php
+++ b/app/code/core/Mage/Wishlist/Model/Observer.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item.php b/app/code/core/Mage/Wishlist/Model/Resource/Item.php
index 3974c327b8..414018d826 100755
--- a/app/code/core/Mage/Wishlist/Model/Resource/Item.php
+++ b/app/code/core/Mage/Wishlist/Model/Resource/Item.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php
index 30954dabaf..e449325204 100755
--- a/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php
+++ b/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -52,7 +52,7 @@ class Mage_Wishlist_Model_Resource_Item_Collection extends Mage_Core_Model_Resou
* If product out of stock, its item will be removed after load
*
* @var bool
- */
+ */
protected $_productInStock = false;
/**
@@ -173,6 +173,11 @@ protected function _assignProducts()
foreach ($storeIds as $id) {
$productCollection->addStoreFilter($id);
}
+
+ if ($this->_productVisible) {
+ Mage::getSingleton('catalog/product_visibility')->addVisibleInSiteFilterToCollection($productCollection);
+ }
+
$productCollection->addPriceData()
->addTaxPercents()
->addIdFilter($this->_productIds)
@@ -180,9 +185,6 @@ protected function _assignProducts()
->addOptionsToResult()
->addUrlRewrite();
- if ($this->_productVisible) {
- Mage::getSingleton('catalog/product_visibility')->addVisibleInSiteFilterToCollection($productCollection);
- }
if ($this->_productSalable) {
$productCollection = Mage::helper('adminhtml/sales')->applySalableProductTypesFilter($productCollection);
}
@@ -196,7 +198,7 @@ protected function _assignProducts()
foreach ($this as $item) {
$product = $productCollection->getItemById($item->getProductId());
if ($product) {
- if ($checkInStock && !$product->isSalable()) {
+ if ($checkInStock && !$product->isInStock()) {
$this->removeItemByKey($item->getId());
} else {
$product->setCustomOptions(array());
@@ -227,6 +229,24 @@ public function addWishlistFilter(Mage_Wishlist_Model_Wishlist $wishlist)
return $this;
}
+ /**
+ * Add filtration by customer id
+ *
+ * @param int $customerId
+ * @return Mage_Wishlist_Model_Resource_Item_Collection
+ */
+ public function addCustomerIdFilter($customerId)
+ {
+ $this->getSelect()
+ ->join(
+ array('wishlist' => $this->getTable('wishlist/wishlist')),
+ 'main_table.wishlist_id = wishlist.wishlist_id',
+ array()
+ )
+ ->where('wishlist.customer_id = ?', $customerId);
+ return $this;
+ }
+
/**
* Add filter by shared stores
*
diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item/Option.php b/app/code/core/Mage/Wishlist/Model/Resource/Item/Option.php
index a47a869966..8751dfcc05 100644
--- a/app/code/core/Mage/Wishlist/Model/Resource/Item/Option.php
+++ b/app/code/core/Mage/Wishlist/Model/Resource/Item/Option.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php
index c9336178c4..4798fca31b 100644
--- a/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php
+++ b/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php
index 466e09e2b3..d84e84a916 100755
--- a/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php
+++ b/app/code/core/Mage/Wishlist/Model/Resource/Product/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php
index b4e42feb86..9976606f6a 100755
--- a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php
+++ b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -56,6 +56,24 @@ protected function _construct()
$this->_init('wishlist/wishlist', 'wishlist_id');
}
+ /**
+ * Prepare wishlist load select query
+ *
+ * @param string $field
+ * @param mixed $value
+ * @param mixed $object
+ * @return Zend_Db_Select
+ */
+ protected function _getLoadSelect($field, $value, $object)
+ {
+ $select = parent::_getLoadSelect($field, $value, $object);
+ if ($field == $this->_customerIdFieldName) {
+ $select->order('wishlist_id ' . Zend_Db_Select::SQL_ASC)
+ ->limit(1);
+ }
+ return $select;
+ }
+
/**
* Getter for customer ID field name
*
diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php
index 26142332fd..9499501bbc 100755
--- a/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php
+++ b/app/code/core/Mage/Wishlist/Model/Resource/Wishlist/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -42,4 +42,39 @@ protected function _construct()
{
$this->_init('wishlist/wishlist');
}
+
+ /**
+ * Filter collection by customer
+ *
+ * @param Mage_Customer_Model_Customer $customer
+ * @return Mage_Wishlist_Model_Resource_Wishlist_Collection
+ */
+ public function filterByCustomer(Mage_Customer_Model_Customer $customer)
+ {
+ return $this->filterByCustomerId($customer->getId());
+ }
+
+ /**
+ * Filter collection by customer id
+ *
+ * @param int $customerId
+ * @return Mage_Wishlist_Model_Resource_Wishlist_Collection
+ */
+ public function filterByCustomerId($customerId)
+ {
+ $this->addFieldToFilter('customer_id', $customerId);
+ return $this;
+ }
+
+ /**
+ * Filter collection by customer ids
+ *
+ * @param array $customerIds
+ * @return Mage_Wishlist_Model_Resource_Wishlist_Collection
+ */
+ public function filterByCustomerIds(array $customerIds)
+ {
+ $this->addFieldToFilter('customer_id', array('in' => $customerIds));
+ return $this;
+ }
}
diff --git a/app/code/core/Mage/Wishlist/Model/Session.php b/app/code/core/Mage/Wishlist/Model/Session.php
index 0e8f11bef7..1087e78aa0 100644
--- a/app/code/core/Mage/Wishlist/Model/Session.php
+++ b/app/code/core/Mage/Wishlist/Model/Session.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/Model/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Wishlist.php
index df9965b8ed..c28ebf22b3 100644
--- a/app/code/core/Mage/Wishlist/Model/Wishlist.php
+++ b/app/code/core/Mage/Wishlist/Model/Wishlist.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -43,6 +43,12 @@
*/
class Mage_Wishlist_Model_Wishlist extends Mage_Core_Model_Abstract
{
+ /**
+ * Prefix of model events names
+ *
+ * @var string
+ */
+ protected $_eventPrefix = 'wishlist';
/**
* Wishlist item collection
*
@@ -97,6 +103,31 @@ public function loadByCustomer($customer, $create = false)
return $this;
}
+ /**
+ * Retrieve wishlist name
+ *
+ * @return string
+ */
+ public function getName()
+ {
+ $name = $this->_getData('name');
+ if (!strlen($name)) {
+ return Mage::helper('wishlist')->getDefaultWishlistName();
+ }
+ return $name;
+ }
+
+ /**
+ * Set random sharing code
+ *
+ * @return Mage_Wishlist_Model_Wishlist
+ */
+ public function generateSharingCode()
+ {
+ $this->setSharingCode($this->_getSharingRandomCode());
+ return $this;
+ }
+
/**
* Load by sharing code
*
@@ -180,6 +211,9 @@ protected function _addCatalogProduct(Mage_Catalog_Model_Product $product, $qty
->setProduct($product)
->setQty($qty)
->save();
+ if ($item->getId()) {
+ $this->getItemCollection()->addItem($item);
+ }
} else {
$qty = $forciblySetQty ? $qty : $item->getQty() + $qty;
$item->setQty($qty)
@@ -357,7 +391,7 @@ public function setCustomerId($customerId)
/**
* Retrieve customer id
*
- * @return Mage_Wishlist_Model_Wishlist
+ * @return int
*/
public function getCustomerId()
{
@@ -489,7 +523,7 @@ public function isOwner($customerId)
*
* For more options see Mage_Catalog_Helper_Product->addParamsToBuyRequest()
*
- * @param int $itemId
+ * @param int|Mage_Wishlist_Model_Item $itemId
* @param Varien_Object $buyRequest
* @param null|array|Varien_Object $params
* @return Mage_Wishlist_Model_Wishlist
@@ -498,7 +532,12 @@ public function isOwner($customerId)
*/
public function updateItem($itemId, $buyRequest, $params = null)
{
- $item = $this->getItem((int)$itemId);
+ $item = null;
+ if ($itemId instanceof Mage_Wishlist_Model_Item) {
+ $item = $itemId;
+ } else {
+ $item = $this->getItem((int)$itemId);
+ }
if (!$item) {
Mage::throwException(Mage::helper('wishlist')->__('Cannot specify wishlist item.'));
}
@@ -549,4 +588,15 @@ public function updateItem($itemId, $buyRequest, $params = null)
}
return $this;
}
+
+ /**
+ * Save wishlist.
+ *
+ * @return Mage_Wishlist_Model_Wishlist
+ */
+ public function save()
+ {
+ $this->_hasDataChanges = true;
+ return parent::save();
+ }
}
diff --git a/app/code/core/Mage/Wishlist/controllers/IndexController.php b/app/code/core/Mage/Wishlist/controllers/IndexController.php
index 37c97c554e..ca92d79e83 100644
--- a/app/code/core/Mage/Wishlist/controllers/IndexController.php
+++ b/app/code/core/Mage/Wishlist/controllers/IndexController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -54,7 +54,7 @@ public function preDispatch()
if (!$this->_skipAuthentication && !Mage::getSingleton('customer/session')->authenticate($this)) {
$this->setFlag('', 'no-dispatch', true);
- if(!Mage::getSingleton('customer/session')->getBeforeWishlistUrl()) {
+ if (!Mage::getSingleton('customer/session')->getBeforeWishlistUrl()) {
Mage::getSingleton('customer/session')->setBeforeWishlistUrl($this->_getRefererUrl());
}
Mage::getSingleton('customer/session')->setBeforeWishlistRequest($this->getRequest()->getParams());
@@ -78,10 +78,10 @@ public function skipAuthentication()
/**
* Retrieve wishlist object
- *
+ * @param int $wishlistId
* @return Mage_Wishlist_Model_Wishlist|bool
*/
- protected function _getWishlist()
+ protected function _getWishlist($wishlistId = null)
{
$wishlist = Mage::registry('wishlist');
if ($wishlist) {
@@ -89,14 +89,32 @@ protected function _getWishlist()
}
try {
- $wishlist = Mage::getModel('wishlist/wishlist')
- ->loadByCustomer(Mage::getSingleton('customer/session')->getCustomer(), true);
+ if (!$wishlistId) {
+ $wishlistId = $this->getRequest()->getParam('wishlist_id');
+ }
+ $customerId = Mage::getSingleton('customer/session')->getCustomerId();
+ /* @var Mage_Wishlist_Model_Wishlist $wishlist */
+ $wishlist = Mage::getModel('wishlist/wishlist');
+ if ($wishlistId) {
+ $wishlist->load($wishlistId);
+ } else {
+ $wishlist->loadByCustomer($customerId, true);
+ }
+
+ if (!$wishlist->getId() || $wishlist->getCustomerId() != $customerId) {
+ $wishlist = null;
+ Mage::throwException(
+ Mage::helper('wishlist')->__("Requested wishlist doesn't exist")
+ );
+ }
+
Mage::register('wishlist', $wishlist);
} catch (Mage_Core_Exception $e) {
Mage::getSingleton('wishlist/session')->addError($e->getMessage());
+ return false;
} catch (Exception $e) {
Mage::getSingleton('wishlist/session')->addException($e,
- Mage::helper('wishlist')->__('Cannot create wishlist.')
+ Mage::helper('wishlist')->__('Wishlist could not be created.')
);
return false;
}
@@ -109,10 +127,11 @@ protected function _getWishlist()
*/
public function indexAction()
{
- $this->_getWishlist();
+ if (!$this->_getWishlist()) {
+ return $this->norouteAction();
+ }
$this->loadLayout();
-
$session = Mage::getSingleton('customer/session');
$block = $this->getLayout()->getBlock('customer.wishlist');
$referer = $session->getAddActionReferer(true);
@@ -136,13 +155,13 @@ public function indexAction()
*/
public function addAction()
{
- $session = Mage::getSingleton('customer/session');
$wishlist = $this->_getWishlist();
if (!$wishlist) {
- $this->_redirect('*/');
- return;
+ return $this->norouteAction();
}
+ $session = Mage::getSingleton('customer/session');
+
$productId = (int) $this->getRequest()->getParam('product');
if (!$productId) {
$this->_redirect('*/');
@@ -203,7 +222,7 @@ public function addAction()
$session->addError($this->__('An error occurred while adding item to wishlist.'));
}
- $this->_redirect('*');
+ $this->_redirect('*', array('wishlist_id' => $wishlist->getId()));
}
/**
@@ -212,13 +231,16 @@ public function addAction()
public function configureAction()
{
$id = (int) $this->getRequest()->getParam('id');
- $wishlist = $this->_getWishlist();
- /* @var $item Mage_Wishlist_Model_Item */
- $item = $wishlist->getItem($id);
-
try {
- if (!$item) {
- throw new Exception($this->__('Cannot load wishlist item'));
+ /* @var $item Mage_Wishlist_Model_Item */
+ $item = Mage::getModel('wishlist/item');
+ $item->loadWithOptions($id);
+ if (!$item->getId()) {
+ Mage::throwException($this->__('Cannot load wishlist item'));
+ }
+ $wishlist = $this->_getWishlist($item->getWishlistId());
+ if (!$wishlist) {
+ return $this->norouteAction();
}
Mage::register('wishlist_item', $item);
@@ -226,7 +248,6 @@ public function configureAction()
$params = new Varien_Object();
$params->setCategoryId(false);
$params->setConfigureMode(true);
-
$buyRequest = $item->getBuyRequest();
if (!$buyRequest->getQty() && $item->getQty()) {
$buyRequest->setQty($item->getQty());
@@ -236,7 +257,6 @@ public function configureAction()
Mage::helper('wishlist')->calculate();
}
$params->setBuyRequest($buyRequest);
-
Mage::helper('catalog/product_view')->prepareAndRender($item->getProductId(), $this, $params);
} catch (Mage_Core_Exception $e) {
Mage::getSingleton('customer/session')->addError($e->getMessage());
@@ -256,12 +276,6 @@ public function configureAction()
public function updateItemOptionsAction()
{
$session = Mage::getSingleton('customer/session');
- $wishlist = $this->_getWishlist();
- if (!$wishlist) {
- $this->_redirect('*/');
- return;
- }
-
$productId = (int) $this->getRequest()->getParam('product');
if (!$productId) {
$this->_redirect('*/');
@@ -277,6 +291,15 @@ public function updateItemOptionsAction()
try {
$id = (int) $this->getRequest()->getParam('id');
+ /* @var Mage_Wishlist_Model_Item */
+ $item = Mage::getModel('wishlist/item');
+ $item->load($id);
+ $wishlist = $this->_getWishlist($item->getWishlistId());
+ if (!$wishlist) {
+ $this->_redirect('*/');
+ return;
+ }
+
$buyRequest = new Varien_Object($this->getRequest()->getParams());
$wishlist->updateItem($id, $buyRequest)
@@ -297,7 +320,7 @@ public function updateItemOptionsAction()
$session->addError($this->__('An error occurred while updating wishlist.'));
Mage::logException($e);
}
- $this->_redirect('*/*');
+ $this->_redirect('*/*', array('wishlist_id' => $wishlist->getId()));
}
/**
@@ -308,9 +331,13 @@ public function updateAction()
if (!$this->_validateFormKey()) {
return $this->_redirect('*/*/');
}
+ $wishlist = $this->_getWishlist();
+ if (!$wishlist) {
+ return $this->norouteAction();
+ }
+
$post = $this->getRequest()->getPost();
if($post && isset($post['description']) && is_array($post['description'])) {
- $wishlist = $this->_getWishlist();
$updatedItems = 0;
foreach ($post['description'] as $itemId => $description) {
@@ -373,11 +400,11 @@ public function updateAction()
}
if (isset($post['save_and_share'])) {
- $this->_redirect('*/*/share');
+ $this->_redirect('*/*/share', array('wishlist_id' => $wishlist->getId()));
return;
}
}
- $this->_redirect('*');
+ $this->_redirect('*', array('wishlist_id' => $wishlist->getId()));
}
/**
@@ -385,25 +412,26 @@ public function updateAction()
*/
public function removeAction()
{
- $wishlist = $this->_getWishlist();
$id = (int) $this->getRequest()->getParam('item');
$item = Mage::getModel('wishlist/item')->load($id);
-
- if($item->getWishlistId() == $wishlist->getId()) {
- try {
- $item->delete();
- $wishlist->save();
- }
- catch (Mage_Core_Exception $e) {
- Mage::getSingleton('customer/session')->addError(
- $this->__('An error occurred while deleting the item from wishlist: %s', $e->getMessage())
- );
- }
- catch(Exception $e) {
- Mage::getSingleton('customer/session')->addError(
- $this->__('An error occurred while deleting the item from wishlist.')
- );
- }
+ if (!$item->getId()) {
+ return $this->norouteAction();
+ }
+ $wishlist = $this->_getWishlist($item->getWishlistId());
+ if (!$wishlist) {
+ return $this->norouteAction();
+ }
+ try {
+ $item->delete();
+ $wishlist->save();
+ } catch (Mage_Core_Exception $e) {
+ Mage::getSingleton('customer/session')->addError(
+ $this->__('An error occurred while deleting the item from wishlist: %s', $e->getMessage())
+ );
+ } catch(Exception $e) {
+ Mage::getSingleton('customer/session')->addError(
+ $this->__('An error occurred while deleting the item from wishlist.')
+ );
}
Mage::helper('wishlist')->calculate();
@@ -416,21 +444,18 @@ public function removeAction()
*
* If Product has required options - item removed from wishlist and redirect
* to product view page with message about needed defined required options
- *
*/
public function cartAction()
{
- $wishlist = $this->_getWishlist();
- if (!$wishlist) {
- return $this->_redirect('*/*');
- }
-
$itemId = (int) $this->getRequest()->getParam('item');
/* @var $item Mage_Wishlist_Model_Item */
$item = Mage::getModel('wishlist/item')->load($itemId);
-
- if (!$item->getId() || $item->getWishlistId() != $wishlist->getId()) {
+ if (!$item->getId()) {
+ return $this->_redirect('*/*');
+ }
+ $wishlist = $this->_getWishlist($item->getWishlistId());
+ if (!$wishlist) {
return $this->_redirect('*/*');
}
@@ -496,20 +521,81 @@ public function cartAction()
return $this->_redirectUrl($redirectUrl);
}
+ /**
+ * Add cart item to wishlist and remove from cart
+ */
+ public function fromcartAction()
+ {
+ $wishlist = $this->_getWishlist();
+ if (!$wishlist) {
+ return $this->norouteAction();
+ }
+ $itemId = (int) $this->getRequest()->getParam('item');
+
+ /* @var Mage_Checkout_Model_Cart $cart */
+ $cart = Mage::getSingleton('checkout/cart');
+ $session = Mage::getSingleton('checkout/session');
+
+ try{
+ $item = $cart->getQuote()->getItemById($itemId);
+ if (!$item) {
+ Mage::throwException(
+ Mage::helper('wishlist')->__("Requested cart item doesn't exist")
+ );
+ }
+
+ $productId = $item->getProductId();
+ $buyRequest = $item->getBuyRequest();
+
+ $wishlist->addNewItem($productId, $buyRequest);
+
+ $productIds[] = $productId;
+ $cart->getQuote()->removeItem($itemId);
+ $cart->save();
+ Mage::helper('wishlist')->calculate();
+ $productName = Mage::helper('core')->escapeHtml($item->getProduct()->getName());
+ $wishlistName = Mage::helper('core')->escapeHtml($wishlist->getName());
+ $session->addSuccess(
+ Mage::helper('wishlist')->__("%s has been moved to wishlist %s", $productName, $wishlistName)
+ );
+ $wishlist->save();
+ } catch (Mage_Core_Exception $e) {
+ $session->addError($e->getMessage());
+ } catch (Exception $e) {
+ $session->addException($e, Mage::helper('wishlist')->__('Cannot move item to wishlist'));
+ }
+
+ return $this->_redirectUrl(Mage::helper('checkout/cart')->getCartUrl());
+ }
+
+ /**
+ * Prepare wishlist for share
+ */
public function shareAction()
{
+ $this->_getWishlist();
$this->loadLayout();
$this->_initLayoutMessages('customer/session');
$this->_initLayoutMessages('wishlist/session');
$this->renderLayout();
}
+ /**
+ * Share wishlist
+ *
+ * @return Mage_Core_Controller_Varien_Action|void
+ */
public function sendAction()
{
if (!$this->_validateFormKey()) {
return $this->_redirect('*/*/');
}
+ $wishlist = $this->_getWishlist();
+ if (!$wishlist) {
+ return $this->norouteAction();
+ }
+
$emails = explode(',', $this->getRequest()->getPost('emails'));
$message = nl2br(htmlspecialchars((string) $this->getRequest()->getPost('message')));
$error = false;
@@ -539,11 +625,13 @@ public function sendAction()
try {
$customer = Mage::getSingleton('customer/session')->getCustomer();
- $wishlist = $this->_getWishlist();
/*if share rss added rss feed to email template*/
if ($this->getRequest()->getParam('rss_url')) {
- $rss_url = $this->getLayout()->createBlock('wishlist/share_email_rss')->toHtml();
+ $rss_url = $this->getLayout()
+ ->createBlock('wishlist/share_email_rss')
+ ->setWishlistId($wishlist->getId())
+ ->toHtml();
$message .=$rss_url;
}
$wishlistBlock = $this->getLayout()->createBlock('wishlist/share_email_items')->toHtml();
@@ -579,7 +667,7 @@ public function sendAction()
Mage::getSingleton('customer/session')->addSuccess(
$this->__('Your Wishlist has been shared.')
);
- $this->_redirect('*/*');
+ $this->_redirect('*/*', array('wishlist_id' => $wishlist->getId()));
}
catch (Exception $e) {
$translate->setTranslateInline(true);
@@ -592,28 +680,45 @@ public function sendAction()
/**
* Custom options download action
- *
* @return void
*/
public function downloadCustomOptionAction()
{
+ $option = Mage::getModel('wishlist/item_option')->load($this->getRequest()->getParam('id'));
+
+ if (!$option->getId()) {
+ return $this->_forward('noRoute');
+ }
+
+ $optionId = null;
+ if (strpos($option->getCode(), Mage_Catalog_Model_Product_Type_Abstract::OPTION_PREFIX) === 0) {
+ $optionId = str_replace(Mage_Catalog_Model_Product_Type_Abstract::OPTION_PREFIX, '', $option->getCode());
+ if ((int)$optionId != $optionId) {
+ return $this->_forward('noRoute');
+ }
+ }
+ $productOption = Mage::getModel('catalog/product_option')->load($optionId);
+
+ if (!$productOption
+ || !$productOption->getId()
+ || $productOption->getProductId() != $option->getProductId()
+ || $productOption->getType() != 'file'
+ ) {
+ return $this->_forward('noRoute');
+ }
+
try {
- $optionId = $this->getRequest()->getParam('id');
- $option = Mage::getModel('wishlist/item_option')->load($optionId);
- $hasError = false;
-
- if ($option->getId() && $option->getCode() !== 'info_buyRequest') {
- $info = unserialize($option->getValue());
- $filePath = Mage::getBaseDir() . $info['quote_path'];
- $secretKey = $this->getRequest()->getParam('key');
-
- if ($secretKey == $info['secret_key']) {
- $this->_prepareDownloadResponse($info['title'], array(
- 'value' => $filePath,
- 'type' => 'filename'
- ));
- }
+ $info = unserialize($option->getValue());
+ $filePath = Mage::getBaseDir() . $info['quote_path'];
+ $secretKey = $this->getRequest()->getParam('key');
+
+ if ($secretKey == $info['secret_key']) {
+ $this->_prepareDownloadResponse($info['title'], array(
+ 'value' => $filePath,
+ 'type' => 'filename'
+ ));
}
+
} catch(Exception $e) {
$this->_forward('noRoute');
}
diff --git a/app/code/core/Mage/Wishlist/controllers/SharedController.php b/app/code/core/Mage/Wishlist/controllers/SharedController.php
index 947718b619..cfbfa19781 100644
--- a/app/code/core/Mage/Wishlist/controllers/SharedController.php
+++ b/app/code/core/Mage/Wishlist/controllers/SharedController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -66,7 +66,7 @@ public function indexAction()
$customerId = Mage::getSingleton('customer/session')->getCustomerId();
if ($wishlist && $wishlist->getCustomerId() && $wishlist->getCustomerId() == $customerId) {
- $this->_redirectUrl(Mage::helper('wishlist')->getListUrl());
+ $this->_redirectUrl(Mage::helper('wishlist')->getListUrl($wishlist->getId()));
return;
}
diff --git a/app/code/core/Mage/Wishlist/etc/adminhtml.xml b/app/code/core/Mage/Wishlist/etc/adminhtml.xml
index 207896588b..5fbdd6cfcd 100644
--- a/app/code/core/Mage/Wishlist/etc/adminhtml.xml
+++ b/app/code/core/Mage/Wishlist/etc/adminhtml.xml
@@ -21,7 +21,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Wishlist/etc/config.xml b/app/code/core/Mage/Wishlist/etc/config.xml
index 511cfbadbc..ff10c2d6b2 100644
--- a/app/code/core/Mage/Wishlist/etc/config.xml
+++ b/app/code/core/Mage/Wishlist/etc/config.xml
@@ -21,7 +21,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Wishlist/etc/system.xml b/app/code/core/Mage/Wishlist/etc/system.xml
index 67d8670481..d54af4ad52 100644
--- a/app/code/core/Mage/Wishlist/etc/system.xml
+++ b/app/code/core/Mage/Wishlist/etc/system.xml
@@ -21,7 +21,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/install-1.6.0.0.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/install-1.6.0.0.php
index 6037dd7376..a79af091af 100644
--- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/install-1.6.0.0.php
+++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/install-1.6.0.0.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-install-0.7.0.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-install-0.7.0.php
index 6ce20da535..14de2d562e 100644
--- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-install-0.7.0.php
+++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-install-0.7.0.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.0-0.7.1.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.0-0.7.1.php
index 99959a99db..e7279966af 100644
--- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.0-0.7.1.php
+++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.0-0.7.1.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.1-0.7.2.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.1-0.7.2.php
index a4a6a7818e..a7a29c25cd 100644
--- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.1-0.7.2.php
+++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.1-0.7.2.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.2-0.7.4.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.2-0.7.4.php
index a675cd4f33..5d9873a941 100644
--- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.2-0.7.4.php
+++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.2-0.7.4.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.4-0.7.5.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.4-0.7.5.php
index a3983c5c1b..08b0a9e1cf 100644
--- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.4-0.7.5.php
+++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.4-0.7.5.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.5-0.7.6.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.5-0.7.6.php
index 5983890e2b..5e855d74c3 100644
--- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.5-0.7.6.php
+++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.5-0.7.6.php
@@ -20,6 +20,6 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.6-0.7.7.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.6-0.7.7.php
index 0e985ece64..eb9f3a2352 100644
--- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.6-0.7.7.php
+++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.6-0.7.7.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.7-0.7.8.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.7-0.7.8.php
index 7d3bfc6a9f..8e6594296e 100644
--- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.7-0.7.8.php
+++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.7-0.7.8.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.8-0.7.9.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.8-0.7.9.php
index 44d5b5f63f..962ac036ca 100644
--- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.8-0.7.9.php
+++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-0.7.8-0.7.9.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php
index 2b673b396c..a1157432dd 100644
--- a/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php
+++ b/app/code/core/Mage/Wishlist/sql/wishlist_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Wishlist
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/History.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/History.php
index eb4169af97..7c360ebdd5 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/History.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/History.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/History/Grid.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/History/Grid.php
index 79fb163932..85dce07e86 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/History/Grid.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/History/Grid.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile.php
index 310acf8d36..81359d4a45 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit.php
index 2144e9bab0..0062010544 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Form.php
index 0117686836..7a0dbc7963 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Form.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Submission.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Submission.php
index 6c1af9ac6e..2318d01c85 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Submission.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Submission.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Cache.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Cache.php
index fd5ed70bce..4f10bc15b3 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Cache.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Cache.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Content.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Content.php
index 57e97bb4e6..94a972135a 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Content.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Content.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design.php
index 5ef12f4e69..b6a249a667 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion.php
index 5045b69c57..ff110010fc 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Images.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Images.php
index 38f366cc6e..a6200ce42c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Images.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Images.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Tabs.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Tabs.php
index d62626d6fb..f2e6def2ca 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Tabs.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Tabs.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Themes.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Themes.php
index 85c10048ce..fe6ba24350 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Themes.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Accordion/Themes.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Preview.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Preview.php
index 527edf358a..1a22792209 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Preview.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Preview.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Themes.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Themes.php
index 4307b30df1..aebee48234 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Themes.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Themes.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Flurryanalytics.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Flurryanalytics.php
index 2a4124638e..ca2381bbc8 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Flurryanalytics.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Flurryanalytics.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/General.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/General.php
index 0b325ccf95..01cb42cc77 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/General.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/General.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Notification.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Notification.php
index e339b4065b..df98f93347 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Notification.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Notification.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Payment.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Payment.php
index 742d212785..536cab6e6d 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Payment.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Payment.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Settings.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Settings.php
index faac69b2e4..567aa0c5f2 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Settings.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Settings.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Social.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Social.php
index a1c6807a3a..284a542aeb 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Social.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Social.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Submission/History.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Submission/History.php
index c73fc34e76..16e1aedee2 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Submission/History.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Submission/History.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tabs.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tabs.php
index 7cfc88b7ba..439cb31473 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tabs.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tabs.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Addrow.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Addrow.php
index 67cabb2c70..5b7f08f57c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Addrow.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Addrow.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -48,9 +48,9 @@ public function getElementHtml()
. '" value="'.$this->getEscapedValue()
. '" '
. $this->serialize($this->getHtmlAttributes())
- . ' >'
+ . ' >'
. $this->getEscapedValue()
- . ''
+ . ''
. $this->getAfterElementHtml();
return $html;
}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Color.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Color.php
index b4e7472c54..1bedd5149d 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Color.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Color.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Country.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Country.php
index 75143b51d8..432cdc0104 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Country.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Country.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Datetime.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Datetime.php
index cf421029ed..0e4e4e15b7 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Datetime.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Datetime.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Font.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Font.php
index ab86d400b1..148f26ae4b 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Font.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Font.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Image.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Image.php
index b355132b42..eb3eb99298 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Image.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Image.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Page.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Page.php
index cca94ca4f5..9a0af5a78b 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Page.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Page.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -100,8 +100,8 @@ public function getElementHtml()
list($label, $element) = $this->getElements();
return $element->toHtml()
. ''
- . '';
}
}
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Tabs.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Tabs.php
index e9b55f0087..3a587bd61c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Tabs.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Tabs.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Theme.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Theme.php
index 387a0594c4..fbb6eba69c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Theme.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Form/Element/Theme.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid.php
index f8104e89b3..3535a635a4 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Bool.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Bool.php
index b7ad0302cf..669565e8e3 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Bool.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Bool.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Type.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Type.php
index 1e4ef26887..ee1aea56c3 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Type.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Grid/Renderer/Type.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Content.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Content.php
index b404f60ce4..e186e706de 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Content.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Content.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Tabitems.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Tabitems.php
index 686d041f95..0479082e56 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Tabitems.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Preview/Tabitems.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission.php
index 4a40c9f1da..408c52b022 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Form.php
index c68925f62d..324b717b76 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Form.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Androidmarket.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Androidmarket.php
index 88727eb231..c1208ef9f1 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Androidmarket.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Androidmarket.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Istore.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Istore.php
index 36aec5fa42..c3b5818b50 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Istore.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Renderer/Country/Istore.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container.php
index 0ef2f1e2c3..714421eff0 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container/Submission.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container/Submission.php
index 179bd6b834..88e1fa6772 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container/Submission.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tab/Container/Submission.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tabs.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tabs.php
index 864ede2790..22e87602d1 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tabs.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Submission/Tabs.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Widget/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Widget/Form.php
index 79b93c2167..02cbc90487 100644
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Widget/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Widget/Form.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue.php
index 7c6dcc0b11..a7f1f9936b 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit.php
index ef150e638a..c0ff18aa2d 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit/Form.php
index 875d4831b8..42543a31b6 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Edit/Form.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid.php
index aa690dd73b..f20f38f663 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Action.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Action.php
index 4c550dc62c..d7e64838d1 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Action.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Action.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Application.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Application.php
index b094db007e..622ba3b850 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Application.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Application.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Id.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Id.php
index d0e8ca4396..5f38dbda85 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Id.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Id.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Msgtitle.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Msgtitle.php
index 29639ebcad..d327133c99 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Msgtitle.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Msgtitle.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Pushtitle.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Pushtitle.php
index 7e28ee3e6a..b646151319 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Pushtitle.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Pushtitle.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Status.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Status.php
index c097e2881c..726ce287d3 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Status.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Status.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Template.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Template.php
index 622603e809..4e0974a241 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Template.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Queue/Grid/Renderer/Template.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template.php
index 7244adfd0f..81e41bacde 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit.php
index ecf2dc965a..930ae08125 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit/Form.php
index ffa43c1632..28e19ff1d9 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Edit/Form.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid.php
index 1ab0ee9d8b..9e0e9eb840 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Application.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Application.php
index bb47be885b..be448d7b66 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Application.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Application.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Name.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Name.php
index e2f3fce37b..d51810f6e7 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Name.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Grid/Renderer/Name.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview.php
index bc44abd4c9..632ad10790 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview/Form.php b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview/Form.php
index 51b7d068e8..d52ecd7347 100755
--- a/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Adminhtml/Template/Preview/Form.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart.php b/app/code/core/Mage/XmlConnect/Block/Cart.php
index b126dc84b4..bb0eb2df99 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Crosssell.php b/app/code/core/Mage/XmlConnect/Block/Cart/Crosssell.php
index ed7bc5e15c..ea0e1c0215 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Crosssell.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Crosssell.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Info.php b/app/code/core/Mage/XmlConnect/Block/Cart/Info.php
index ad7e66cd24..20e8b395e2 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Info.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Info.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer.php b/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer.php
index 3ab6f66d0a..a66085894d 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer/Configurable.php b/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer/Configurable.php
index 86e2b530c5..1a1e3d3a6c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer/Configurable.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer/Configurable.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer/Grouped.php b/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer/Grouped.php
index 49e539e4c6..9d4a0870fc 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer/Grouped.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Item/Renderer/Grouped.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Details.php b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Details.php
index 59561df5b8..b2be761c90 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Details.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Details.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Review.php b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Review.php
index a2c8a07e87..17547b1b26 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Review.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Review.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Shippingmethods.php b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Shippingmethods.php
index d8d5f2dff9..2af5205d77 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Shippingmethods.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mecl/Shippingmethods.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php
index 0903d6b3f1..a47933edde 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Paypal/Mep/Totals.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Cart/Totals.php b/app/code/core/Mage/XmlConnect/Block/Cart/Totals.php
index 67c786c5b7..8ae9270f5a 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cart/Totals.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cart/Totals.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog.php b/app/code/core/Mage/XmlConnect/Block/Catalog.php
index 91399be2a9..1ab02e34a4 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Category.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Category.php
index 28bd9e207a..ce7cc19188 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Category.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Category.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Category/Info.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Category/Info.php
index 9d24ae57be..7956c05cd0 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Category/Info.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Category/Info.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Filters.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Filters.php
index dadbce1c4b..86a7c1e515 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Filters.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Filters.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product.php
index 095e01bf86..cfb7e9cc57 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Attributes.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Attributes.php
index 6daac159e8..f58be5d712 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Attributes.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Attributes.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Gallery.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Gallery.php
index 44c78c096e..4222bbaa10 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Gallery.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Gallery.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/List.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/List.php
index 602028af47..cf41a14f0a 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/List.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/List.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options.php
index 7d276e29cf..aa90b448fa 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Bundle.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Bundle.php
index 690021844b..96626b9510 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Bundle.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Bundle.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Configurable.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Configurable.php
index 6edc281770..a7e6424b2d 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Configurable.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Configurable.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Giftcard.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Giftcard.php
index 5aee915c91..9d9013d3a4 100755
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Giftcard.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Giftcard.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Grouped.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Grouped.php
index cdedcea493..6c5569254e 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Grouped.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Grouped.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Simple.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Simple.php
index a4e1d42e0e..a30022fb19 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Simple.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Simple.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Virtual.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Virtual.php
index 8c6b189cd6..dedeb1f853 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Virtual.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Options/Virtual.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price.php
index 7e8fca1128..cab8818363 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Bundle.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Bundle.php
index 7670fd4ea2..648c85c60d 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Bundle.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Bundle.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Default.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Default.php
index c136f84d49..484840c780 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Default.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Default.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Giftcard.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Giftcard.php
index 5924e86c9d..d36c4e807b 100755
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Giftcard.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Price/Giftcard.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Related.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Related.php
index 5a15f6d6a0..4886320b95 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Related.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Related.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review.php
index 3194eb4ac4..b80996181c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review/List.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review/List.php
index 9ed4353766..c835c35c1f 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review/List.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Product/Review/List.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Search.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Search.php
index a2c884779e..1c8873e942 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Search.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Search.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Catalog/Search/Suggest.php b/app/code/core/Mage/XmlConnect/Block/Catalog/Search/Suggest.php
index a3e4ea8cc5..01fe87f091 100644
--- a/app/code/core/Mage/XmlConnect/Block/Catalog/Search/Suggest.php
+++ b/app/code/core/Mage/XmlConnect/Block/Catalog/Search/Suggest.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Billing.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Billing.php
index 891d2b72c2..cf5804faf2 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Billing.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Billing.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Form.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Form.php
index 8e1cc2d555..096ce88da9 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Form.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Shipping.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Shipping.php
index f29eef62bf..97b4d52f3e 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Shipping.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Address/Shipping.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Agreements.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Agreements.php
index bb6f3285f2..78be124d63 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Agreements.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Agreements.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review.php
index edf07c3e5f..0c90502e07 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review/Info.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review/Info.php
index 3988c74f86..58edca8f9c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review/Info.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Order/Review/Info.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Authorizenet.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Authorizenet.php
index 11a06acec3..0223d2cda6 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Authorizenet.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Authorizenet.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Ccsave.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Ccsave.php
index 3b2c1da1f7..384a15d165 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Ccsave.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Ccsave.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Checkmo.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Checkmo.php
index 937646312f..dc4d969a8e 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Checkmo.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Checkmo.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Authorizenet.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Authorizenet.php
index 5cc6f656f6..5769e517ba 100755
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Authorizenet.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Authorizenet.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Ccsave.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Ccsave.php
index 5b49907254..e0a006bd76 100755
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Ccsave.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Ccsave.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Checkmo.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Checkmo.php
index 71527a7105..11a060457e 100755
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Checkmo.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Checkmo.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Free.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Free.php
index 82a9ec85eb..680d6230b2 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Free.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Free.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Abstract.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Abstract.php
index 807ef7d069..2017fa0b26 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Abstract.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Abstract.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Express.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Express.php
index 1979debbd7..f9d783d8dc 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Express.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Express.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Mecl.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Mecl.php
index ea2eec0dbb..f20cb7cc97 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Mecl.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Paypal/Mecl.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Authorizenet.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Authorizenet.php
index d0f6362706..bd9b955798 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Authorizenet.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Authorizenet.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Paypal/Direct.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Paypal/Direct.php
index dd5080b97f..c059afb404 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Paypal/Direct.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Paypal/Direct.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Paypaluk/Direct.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Paypaluk/Direct.php
index 3b885046dc..f721725c9e 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Paypaluk/Direct.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Paypaluk/Direct.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Verisign.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Verisign.php
index d614df0d69..1626d14502 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Verisign.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Pbridge/Verisign.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Purchaseorder.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Purchaseorder.php
index b238223924..f953091701 100755
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Purchaseorder.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Info/Purchaseorder.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php
index 8096a237eb..3e85846913 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/List.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Direct.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Direct.php
index ace6306a33..c37cf5cb39 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Direct.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Direct.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Payflow.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Payflow.php
index 97b9bb7cc2..a3b108d4c6 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Payflow.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Paypal/Payflow.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Abstract.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Abstract.php
index 2f52acfd17..27e4f2ac1c 100755
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Abstract.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Abstract.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Authorizenet.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Authorizenet.php
index 0315456e42..dfd69b09be 100755
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Authorizenet.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Authorizenet.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypal.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypal.php
index 1b7fd0b102..b45e20d617 100755
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypal.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypal.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypaluk.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypaluk.php
index 6af2fad556..97732f80b7 100755
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypaluk.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Paypaluk.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Verisign.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Verisign.php
index 2fdbe679ed..176414ead2 100755
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Verisign.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Pbridge/Verisign.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Purchaseorder.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Purchaseorder.php
index 7ceb780d7a..98348c9360 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Purchaseorder.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Payment/Method/Purchaseorder.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Pbridge/Result.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Pbridge/Result.php
index 9cb4ebabbc..929f2b49b9 100755
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Pbridge/Result.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Pbridge/Result.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/Available.php b/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/Available.php
index a2aa2cfdb8..36266d6015 100644
--- a/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/Available.php
+++ b/app/code/core/Mage/XmlConnect/Block/Checkout/Shipping/Method/Available.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Cms/Page.php b/app/code/core/Mage/XmlConnect/Block/Cms/Page.php
index be878e7134..dabd59c7e2 100644
--- a/app/code/core/Mage/XmlConnect/Block/Cms/Page.php
+++ b/app/code/core/Mage/XmlConnect/Block/Cms/Page.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Configuration.php b/app/code/core/Mage/XmlConnect/Block/Configuration.php
index 6d6ba86331..f8cb2101e6 100644
--- a/app/code/core/Mage/XmlConnect/Block/Configuration.php
+++ b/app/code/core/Mage/XmlConnect/Block/Configuration.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Address/Form.php b/app/code/core/Mage/XmlConnect/Block/Customer/Address/Form.php
index 4a00292e7f..f4b92ffec9 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Address/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Address/Form.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Address/List.php b/app/code/core/Mage/XmlConnect/Block/Customer/Address/List.php
index d4f0e0534f..5300ba2c93 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Address/List.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Address/List.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form.php
index 8e1d18bf96..a5515a5436 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Boolean.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Boolean.php
index fa6d20a8fd..fc8e1a7caa 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Boolean.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Boolean.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Date.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Date.php
index b410dc34a0..9ef0f90644 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Date.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Date.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/File.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/File.php
index 4cb85354b7..8842398675 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/File.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/File.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Image.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Image.php
index 784e6f0e6b..dbf2485e0b 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Image.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Image.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Multiline.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Multiline.php
index 5c625721ab..943a1056ae 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Multiline.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Multiline.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Multiselect.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Multiselect.php
index f529399c48..1b462f1d86 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Multiselect.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Multiselect.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Select.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Select.php
index 8f4af08613..88bf810873 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Select.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Select.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Text.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Text.php
index 21cbace073..e7c7fd3947 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Text.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Text.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Textarea.php b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Textarea.php
index ced68edd34..7840d9306d 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Textarea.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Form/Renderer/Textarea.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/GiftcardCheck.php b/app/code/core/Mage/XmlConnect/Block/Customer/GiftcardCheck.php
index fccd8e5ac8..4361054f1c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/GiftcardCheck.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/GiftcardCheck.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Details.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Details.php
index 5cf64fc278..194fa95a7e 100755
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Details.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Details.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Bundle.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Bundle.php
index 6efc33fe0c..7cc1b2c33a 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Bundle.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Bundle.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Default.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Default.php
index 3f6b45d5c8..1e78f86e3d 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Default.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Default.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Downloadable.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Downloadable.php
index b6f00368e0..a89d77f313 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Downloadable.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Downloadable.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Giftcard.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Giftcard.php
index 0b700a2d12..826f917182 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Giftcard.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Giftcard.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Grouped.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Grouped.php
index d7fe114c3b..44e974503d 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Grouped.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Item/Renderer/Grouped.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Items.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Items.php
index 536d420611..6be03c18cd 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Items.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Items.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/List.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/List.php
index 8e3a4e789b..96254f1890 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/List.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/List.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals.php
index 5f0a980e68..1cdbaf15ec 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance.php
index 7bed9048b3..21440b5785 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance/Refunded.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance/Refunded.php
index 4faca89b0a..0d0e2dd414 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance/Refunded.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Customerbalance/Refunded.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Giftcards.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Giftcards.php
index 68d24a0206..b66db805bb 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Giftcards.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Giftcards.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Tax.php b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Tax.php
index 328aaad6a0..220f5a34a2 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Tax.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Order/Totals/Tax.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Customer/Storecredit.php b/app/code/core/Mage/XmlConnect/Block/Customer/Storecredit.php
index 59792ac05d..6a61446465 100644
--- a/app/code/core/Mage/XmlConnect/Block/Customer/Storecredit.php
+++ b/app/code/core/Mage/XmlConnect/Block/Customer/Storecredit.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Home.php b/app/code/core/Mage/XmlConnect/Block/Home.php
index d058c3eceb..e6f12eb49c 100644
--- a/app/code/core/Mage/XmlConnect/Block/Home.php
+++ b/app/code/core/Mage/XmlConnect/Block/Home.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Review/Form.php b/app/code/core/Mage/XmlConnect/Block/Review/Form.php
index 28dbf76031..9a5b5609e0 100644
--- a/app/code/core/Mage/XmlConnect/Block/Review/Form.php
+++ b/app/code/core/Mage/XmlConnect/Block/Review/Form.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Block/Wishlist.php b/app/code/core/Mage/XmlConnect/Block/Wishlist.php
index e2fb0f7ae4..766844312f 100644
--- a/app/code/core/Mage/XmlConnect/Block/Wishlist.php
+++ b/app/code/core/Mage/XmlConnect/Block/Wishlist.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Controller/Action.php b/app/code/core/Mage/XmlConnect/Controller/Action.php
index 670aeb9cb3..f70c6372a4 100644
--- a/app/code/core/Mage/XmlConnect/Controller/Action.php
+++ b/app/code/core/Mage/XmlConnect/Controller/Action.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Helper/Android.php b/app/code/core/Mage/XmlConnect/Helper/Android.php
index 961612bd39..bac53177fa 100755
--- a/app/code/core/Mage/XmlConnect/Helper/Android.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Android.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Helper/Catalog/Category/Image.php b/app/code/core/Mage/XmlConnect/Helper/Catalog/Category/Image.php
index 8165166a58..8084df3982 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Catalog/Category/Image.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Catalog/Category/Image.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Helper/Customer/Form/Renderer.php b/app/code/core/Mage/XmlConnect/Helper/Customer/Form/Renderer.php
index b7adcfc13a..ca3dd41095 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Customer/Form/Renderer.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Customer/Form/Renderer.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Helper/Customer/Order.php b/app/code/core/Mage/XmlConnect/Helper/Customer/Order.php
index fe877b1135..a854e3aa61 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Customer/Order.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Customer/Order.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Helper/Data.php b/app/code/core/Mage/XmlConnect/Helper/Data.php
index 1413a32a9f..e910c5e01e 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Data.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Data.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Helper/Image.php b/app/code/core/Mage/XmlConnect/Helper/Image.php
index 7d94289c51..c644782063 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Image.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Image.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Helper/Ipad.php b/app/code/core/Mage/XmlConnect/Helper/Ipad.php
index a128537611..546591d625 100755
--- a/app/code/core/Mage/XmlConnect/Helper/Ipad.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Ipad.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Helper/Iphone.php b/app/code/core/Mage/XmlConnect/Helper/Iphone.php
index 73f8954ac2..d41dd0b0ef 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Iphone.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Iphone.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Helper/Payment.php b/app/code/core/Mage/XmlConnect/Helper/Payment.php
index 4a1df2f794..9826dc008e 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Payment.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Payment.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Helper/Theme.php b/app/code/core/Mage/XmlConnect/Helper/Theme.php
index bb69bc374b..9d6bf66ec1 100644
--- a/app/code/core/Mage/XmlConnect/Helper/Theme.php
+++ b/app/code/core/Mage/XmlConnect/Helper/Theme.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -382,7 +382,7 @@ public function deleteTheme($themeId)
$result = false;
$ioFile = new Varien_Io_File();
$ioFile->cd($this->getMediaThemePath());
- $themeFile = $themeId . '.xml';
+ $themeFile = basename($themeId . '.xml');
if ($ioFile->fileExists($themeFile)) {
$result = $ioFile->rm($themeFile);
}
diff --git a/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Baseurl.php b/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Baseurl.php
index e1a658cb99..661a2b711c 100644
--- a/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Baseurl.php
+++ b/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Baseurl.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Currency/Default.php b/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Currency/Default.php
index f8ae325735..87fe118335 100644
--- a/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Currency/Default.php
+++ b/app/code/core/Mage/XmlConnect/Model/Adminhtml/System/Config/Backend/Currency/Default.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Application.php b/app/code/core/Mage/XmlConnect/Model/Application.php
index fe57afaccd..969c327619 100644
--- a/app/code/core/Mage/XmlConnect/Model/Application.php
+++ b/app/code/core/Mage/XmlConnect/Model/Application.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Image.php b/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Image.php
index 3e801a346a..52766753e0 100644
--- a/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Image.php
+++ b/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Image.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Media/Config.php b/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Media/Config.php
index f4b47d32c5..7b99a5fc00 100644
--- a/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Media/Config.php
+++ b/app/code/core/Mage/XmlConnect/Model/Catalog/Category/Media/Config.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/ConfigData.php b/app/code/core/Mage/XmlConnect/Model/ConfigData.php
index 486ff1c137..8e9a73a093 100644
--- a/app/code/core/Mage/XmlConnect/Model/ConfigData.php
+++ b/app/code/core/Mage/XmlConnect/Model/ConfigData.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/History.php b/app/code/core/Mage/XmlConnect/Model/History.php
index 0a84cc8398..b93742028e 100644
--- a/app/code/core/Mage/XmlConnect/Model/History.php
+++ b/app/code/core/Mage/XmlConnect/Model/History.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/Application.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/Application.php
index cec269874c..c2a5e5bb95 100644
--- a/app/code/core/Mage/XmlConnect/Model/Mysql4/Application.php
+++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/Application.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/Application/Collection.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/Application/Collection.php
index 9a77500bb3..8d21f00073 100644
--- a/app/code/core/Mage/XmlConnect/Model/Mysql4/Application/Collection.php
+++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/Application/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/Cms/Page/Collection.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/Cms/Page/Collection.php
index 42869e945f..b18cd849fc 100644
--- a/app/code/core/Mage/XmlConnect/Model/Mysql4/Cms/Page/Collection.php
+++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/Cms/Page/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/ConfigData.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/ConfigData.php
index d86f5d2fc0..c32e9796ba 100644
--- a/app/code/core/Mage/XmlConnect/Model/Mysql4/ConfigData.php
+++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/ConfigData.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/ConfigData/Collection.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/ConfigData/Collection.php
index 79608a5c10..9d884d38ee 100644
--- a/app/code/core/Mage/XmlConnect/Model/Mysql4/ConfigData/Collection.php
+++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/ConfigData/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/Filter/Collection.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/Filter/Collection.php
index 440deb8b61..56bec0775e 100644
--- a/app/code/core/Mage/XmlConnect/Model/Mysql4/Filter/Collection.php
+++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/Filter/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/History.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/History.php
index b9c43e0f6e..cd178ed2da 100644
--- a/app/code/core/Mage/XmlConnect/Model/Mysql4/History.php
+++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/History.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/History/Collection.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/History/Collection.php
index 4419e5bd96..f1b1204f2a 100644
--- a/app/code/core/Mage/XmlConnect/Model/Mysql4/History/Collection.php
+++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/History/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/Queue.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/Queue.php
index 3423248849..524dfa60db 100755
--- a/app/code/core/Mage/XmlConnect/Model/Mysql4/Queue.php
+++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/Queue.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/Queue/Collection.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/Queue/Collection.php
index e2643c75d2..1b043467ca 100755
--- a/app/code/core/Mage/XmlConnect/Model/Mysql4/Queue/Collection.php
+++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/Queue/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/Setup.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/Setup.php
index d7b60f601d..b41277c5d4 100644
--- a/app/code/core/Mage/XmlConnect/Model/Mysql4/Setup.php
+++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/Setup.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/Template.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/Template.php
index 0d9e803ea2..cee534c508 100755
--- a/app/code/core/Mage/XmlConnect/Model/Mysql4/Template.php
+++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/Template.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Mysql4/Template/Collection.php b/app/code/core/Mage/XmlConnect/Model/Mysql4/Template/Collection.php
index fe7ea4390b..2a52bf20e9 100755
--- a/app/code/core/Mage/XmlConnect/Model/Mysql4/Template/Collection.php
+++ b/app/code/core/Mage/XmlConnect/Model/Mysql4/Template/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Observer.php b/app/code/core/Mage/XmlConnect/Model/Observer.php
index 398d059143..09f50d799e 100644
--- a/app/code/core/Mage/XmlConnect/Model/Observer.php
+++ b/app/code/core/Mage/XmlConnect/Model/Observer.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Config.php b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Config.php
index 30ff9fab3e..9088db2f0c 100644
--- a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Config.php
+++ b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Config.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mecl.php b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mecl.php
index e22886200f..eb9419e9b5 100644
--- a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mecl.php
+++ b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mecl.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mep.php b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mep.php
index f527565154..8cc36f0a58 100644
--- a/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mep.php
+++ b/app/code/core/Mage/XmlConnect/Model/Payment/Method/Paypal/Mep.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Paypal/Mecl/Checkout.php b/app/code/core/Mage/XmlConnect/Model/Paypal/Mecl/Checkout.php
index 02ce8c2ead..ef4cc78dde 100644
--- a/app/code/core/Mage/XmlConnect/Model/Paypal/Mecl/Checkout.php
+++ b/app/code/core/Mage/XmlConnect/Model/Paypal/Mecl/Checkout.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Paypal/Mep/Checkout.php b/app/code/core/Mage/XmlConnect/Model/Paypal/Mep/Checkout.php
index 111b28b99d..896ec23505 100644
--- a/app/code/core/Mage/XmlConnect/Model/Paypal/Mep/Checkout.php
+++ b/app/code/core/Mage/XmlConnect/Model/Paypal/Mep/Checkout.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Preview/Abstract.php b/app/code/core/Mage/XmlConnect/Model/Preview/Abstract.php
index 34794c2b8a..4e5ca26cc4 100755
--- a/app/code/core/Mage/XmlConnect/Model/Preview/Abstract.php
+++ b/app/code/core/Mage/XmlConnect/Model/Preview/Abstract.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Preview/Android.php b/app/code/core/Mage/XmlConnect/Model/Preview/Android.php
index 275b65b639..29adb13244 100755
--- a/app/code/core/Mage/XmlConnect/Model/Preview/Android.php
+++ b/app/code/core/Mage/XmlConnect/Model/Preview/Android.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Preview/Ipad.php b/app/code/core/Mage/XmlConnect/Model/Preview/Ipad.php
index 60aa8cb210..b571015abd 100755
--- a/app/code/core/Mage/XmlConnect/Model/Preview/Ipad.php
+++ b/app/code/core/Mage/XmlConnect/Model/Preview/Ipad.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Preview/Iphone.php b/app/code/core/Mage/XmlConnect/Model/Preview/Iphone.php
index 9a946e12e5..ecb427aad0 100755
--- a/app/code/core/Mage/XmlConnect/Model/Preview/Iphone.php
+++ b/app/code/core/Mage/XmlConnect/Model/Preview/Iphone.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Queue.php b/app/code/core/Mage/XmlConnect/Model/Queue.php
index 343b1bec06..b6d109c875 100755
--- a/app/code/core/Mage/XmlConnect/Model/Queue.php
+++ b/app/code/core/Mage/XmlConnect/Model/Queue.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Application.php b/app/code/core/Mage/XmlConnect/Model/Resource/Application.php
index 7e78710983..845cb39f4f 100755
--- a/app/code/core/Mage/XmlConnect/Model/Resource/Application.php
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/Application.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Application/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/Application/Collection.php
index 8bcde33208..c6881dfb89 100755
--- a/app/code/core/Mage/XmlConnect/Model/Resource/Application/Collection.php
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/Application/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Cms/Page/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/Cms/Page/Collection.php
index 46fd005de2..c81b206629 100755
--- a/app/code/core/Mage/XmlConnect/Model/Resource/Cms/Page/Collection.php
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/Cms/Page/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData.php b/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData.php
index 37801f09b4..f6a2399ee6 100644
--- a/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData.php
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData/Collection.php
index 13705353a9..1f729b4627 100644
--- a/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData/Collection.php
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/ConfigData/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Filter/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/Filter/Collection.php
index bf6e2c6562..ede671350c 100755
--- a/app/code/core/Mage/XmlConnect/Model/Resource/Filter/Collection.php
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/Filter/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/History.php b/app/code/core/Mage/XmlConnect/Model/Resource/History.php
index b538fe7ff8..711a10526d 100755
--- a/app/code/core/Mage/XmlConnect/Model/Resource/History.php
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/History.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/History/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/History/Collection.php
index 889f7b9159..a5cd4eed61 100755
--- a/app/code/core/Mage/XmlConnect/Model/Resource/History/Collection.php
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/History/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Queue.php b/app/code/core/Mage/XmlConnect/Model/Resource/Queue.php
index 21d483d3a9..c97f2c610d 100755
--- a/app/code/core/Mage/XmlConnect/Model/Resource/Queue.php
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/Queue.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Queue/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/Queue/Collection.php
index c9fb3bc50c..1b04a8ff73 100755
--- a/app/code/core/Mage/XmlConnect/Model/Resource/Queue/Collection.php
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/Queue/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Setup.php b/app/code/core/Mage/XmlConnect/Model/Resource/Setup.php
index 38fd725905..132cd9817e 100755
--- a/app/code/core/Mage/XmlConnect/Model/Resource/Setup.php
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/Setup.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Template.php b/app/code/core/Mage/XmlConnect/Model/Resource/Template.php
index 03dae7d771..c134ccddc3 100755
--- a/app/code/core/Mage/XmlConnect/Model/Resource/Template.php
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/Template.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Resource/Template/Collection.php b/app/code/core/Mage/XmlConnect/Model/Resource/Template/Collection.php
index f0f00699dd..6b9d0ee251 100755
--- a/app/code/core/Mage/XmlConnect/Model/Resource/Template/Collection.php
+++ b/app/code/core/Mage/XmlConnect/Model/Resource/Template/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Element.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Element.php
index 2f60848fef..83605ace3f 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Element.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Element.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form.php
index 7af540c994..1cc3f0c2bb 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Abstract.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Abstract.php
index 78ce6bc426..9400d1f63c 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Abstract.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Abstract.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Abstract.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Abstract.php
index 2aed90b334..c7be7c237a 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Abstract.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Abstract.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Checkbox.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Checkbox.php
index 62bf94a76b..ee8fc1605c 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Checkbox.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Checkbox.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Collection.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Collection.php
index 0694dd4d9a..1ea98bb64f 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Collection.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/CountryListSelect.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/CountryListSelect.php
index 9872e45779..735ea487b0 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/CountryListSelect.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/CountryListSelect.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Date.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Date.php
index 921364960f..27797d2843 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Date.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Date.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Email.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Email.php
index 382b75fdcc..6b00f4b2ef 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Email.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Email.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Fieldset.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Fieldset.php
index aa6fa3c0e0..865f50d00b 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Fieldset.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Fieldset.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/File.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/File.php
index 286b8ef8f4..d58c73f06b 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/File.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/File.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Image.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Image.php
index ca7570af62..3203054ec1 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Image.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Image.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiline.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiline.php
index efb68d98bb..51bc8af766 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiline.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiline.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiselect.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiselect.php
index 7349989dca..2dbc66dad8 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiselect.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Multiselect.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Renderer/Interface.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Renderer/Interface.php
index c71fd3795a..cf5bdbe481 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Renderer/Interface.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Renderer/Interface.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Select.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Select.php
index 7eda8e14d2..ac5c798b3f 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Select.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Select.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Text.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Text.php
index c664e9c4e0..38d96a3c73 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Text.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Text.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Textarea.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Textarea.php
index 92e1b3c9da..b342fe9cce 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Textarea.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Textarea.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator.php
index 5449685a94..9faec81d93 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator/Abstract.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator/Abstract.php
index 348e76a2f3..abb6dbe680 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator/Abstract.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator/Abstract.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator/Rule.php b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator/Rule.php
index bd47829a6f..0eee1fcf72 100644
--- a/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator/Rule.php
+++ b/app/code/core/Mage/XmlConnect/Model/Simplexml/Form/Element/Validator/Rule.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Tabs.php b/app/code/core/Mage/XmlConnect/Model/Tabs.php
index 58da61abe6..c0d327814d 100644
--- a/app/code/core/Mage/XmlConnect/Model/Tabs.php
+++ b/app/code/core/Mage/XmlConnect/Model/Tabs.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Template.php b/app/code/core/Mage/XmlConnect/Model/Template.php
index 95998f3a52..53d4a5526a 100755
--- a/app/code/core/Mage/XmlConnect/Model/Template.php
+++ b/app/code/core/Mage/XmlConnect/Model/Template.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/Model/Theme.php b/app/code/core/Mage/XmlConnect/Model/Theme.php
index 00acf46e23..d7ed1a226b 100644
--- a/app/code/core/Mage/XmlConnect/Model/Theme.php
+++ b/app/code/core/Mage/XmlConnect/Model/Theme.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php
index 273e0ce38e..f054be13cb 100644
--- a/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -1165,9 +1165,8 @@ public function saveMessageAction()
break;
}
if ($temporaryObject->getExecTime()) {
- $message->setExecTime(
- Mage::getSingleton('core/date')->gmtDate(null, $temporaryObject->getExecTime())
- );
+ $execTime = Mage::getSingleton('core/date')->gmtDate(null, $temporaryObject->getExecTime());
+ $message->setExecTime($execTime ? $execTime : Mage::getSingleton('core/date')->gmtDate());
} else {
$message->setExecTime(new Zend_Db_Expr('NULL'));
}
diff --git a/app/code/core/Mage/XmlConnect/controllers/CartController.php b/app/code/core/Mage/XmlConnect/controllers/CartController.php
index b48bfe6457..7c2a180515 100644
--- a/app/code/core/Mage/XmlConnect/controllers/CartController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/CartController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/controllers/CatalogController.php b/app/code/core/Mage/XmlConnect/controllers/CatalogController.php
index a8775f1aff..552ab22d9c 100644
--- a/app/code/core/Mage/XmlConnect/controllers/CatalogController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/CatalogController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/controllers/CheckoutController.php b/app/code/core/Mage/XmlConnect/controllers/CheckoutController.php
index c7a0161136..e4323b9c05 100644
--- a/app/code/core/Mage/XmlConnect/controllers/CheckoutController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/CheckoutController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/controllers/CmsController.php b/app/code/core/Mage/XmlConnect/controllers/CmsController.php
index 0ea582df1e..e9618778b3 100644
--- a/app/code/core/Mage/XmlConnect/controllers/CmsController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/CmsController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/controllers/ConfigurationController.php b/app/code/core/Mage/XmlConnect/controllers/ConfigurationController.php
index 68c24a2e7e..8440490e05 100644
--- a/app/code/core/Mage/XmlConnect/controllers/ConfigurationController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/ConfigurationController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/controllers/CustomerController.php b/app/code/core/Mage/XmlConnect/controllers/CustomerController.php
index d28f38207d..06f32129ff 100644
--- a/app/code/core/Mage/XmlConnect/controllers/CustomerController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/CustomerController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/controllers/IndexController.php b/app/code/core/Mage/XmlConnect/controllers/IndexController.php
index f4c8c2281b..b5c90257cb 100644
--- a/app/code/core/Mage/XmlConnect/controllers/IndexController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/IndexController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/controllers/Paypal/MeclController.php b/app/code/core/Mage/XmlConnect/controllers/Paypal/MeclController.php
index 9fa4427ca7..e811634afb 100644
--- a/app/code/core/Mage/XmlConnect/controllers/Paypal/MeclController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/Paypal/MeclController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/controllers/Paypal/MepController.php b/app/code/core/Mage/XmlConnect/controllers/Paypal/MepController.php
index 9ae6d5b99e..e25999bfa1 100644
--- a/app/code/core/Mage/XmlConnect/controllers/Paypal/MepController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/Paypal/MepController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/controllers/PbridgeController.php b/app/code/core/Mage/XmlConnect/controllers/PbridgeController.php
index c9ee4ea260..3940270c9f 100755
--- a/app/code/core/Mage/XmlConnect/controllers/PbridgeController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/PbridgeController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/controllers/ReviewController.php b/app/code/core/Mage/XmlConnect/controllers/ReviewController.php
index 0c99bdcb62..29e23352a2 100644
--- a/app/code/core/Mage/XmlConnect/controllers/ReviewController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/ReviewController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/controllers/WishlistController.php b/app/code/core/Mage/XmlConnect/controllers/WishlistController.php
index 7fad737b17..fb7baf8564 100644
--- a/app/code/core/Mage/XmlConnect/controllers/WishlistController.php
+++ b/app/code/core/Mage/XmlConnect/controllers/WishlistController.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/etc/adminhtml.xml b/app/code/core/Mage/XmlConnect/etc/adminhtml.xml
index 356987446b..4dd8b11176 100644
--- a/app/code/core/Mage/XmlConnect/etc/adminhtml.xml
+++ b/app/code/core/Mage/XmlConnect/etc/adminhtml.xml
@@ -21,7 +21,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/XmlConnect/etc/config.xml b/app/code/core/Mage/XmlConnect/etc/config.xml
index 5e9b71ab25..18a3fc7221 100644
--- a/app/code/core/Mage/XmlConnect/etc/config.xml
+++ b/app/code/core/Mage/XmlConnect/etc/config.xml
@@ -21,7 +21,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/XmlConnect/etc/system.xml b/app/code/core/Mage/XmlConnect/etc/system.xml
index 4408c82ca1..be77b17c2e 100644
--- a/app/code/core/Mage/XmlConnect/etc/system.xml
+++ b/app/code/core/Mage/XmlConnect/etc/system.xml
@@ -21,7 +21,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/XmlConnect/etc/themes/custom.xml b/app/code/core/Mage/XmlConnect/etc/themes/custom.xml
index 840ac1dc46..ee5c6459cf 100644
--- a/app/code/core/Mage/XmlConnect/etc/themes/custom.xml
+++ b/app/code/core/Mage/XmlConnect/etc/themes/custom.xml
@@ -21,7 +21,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/XmlConnect/etc/themes/default.xml b/app/code/core/Mage/XmlConnect/etc/themes/default.xml
index 6a4c5c0169..312188091f 100644
--- a/app/code/core/Mage/XmlConnect/etc/themes/default.xml
+++ b/app/code/core/Mage/XmlConnect/etc/themes/default.xml
@@ -21,7 +21,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/XmlConnect/etc/themes/funk_leaf.xml b/app/code/core/Mage/XmlConnect/etc/themes/funk_leaf.xml
index 4d6dca58d4..7996d84845 100644
--- a/app/code/core/Mage/XmlConnect/etc/themes/funk_leaf.xml
+++ b/app/code/core/Mage/XmlConnect/etc/themes/funk_leaf.xml
@@ -21,7 +21,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/XmlConnect/etc/themes/hot_red.xml b/app/code/core/Mage/XmlConnect/etc/themes/hot_red.xml
index 65d6632046..5d1ac641b5 100644
--- a/app/code/core/Mage/XmlConnect/etc/themes/hot_red.xml
+++ b/app/code/core/Mage/XmlConnect/etc/themes/hot_red.xml
@@ -21,7 +21,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/XmlConnect/etc/themes/sky_blue.xml b/app/code/core/Mage/XmlConnect/etc/themes/sky_blue.xml
index 0a620056d3..a61a581280 100644
--- a/app/code/core/Mage/XmlConnect/etc/themes/sky_blue.xml
+++ b/app/code/core/Mage/XmlConnect/etc/themes/sky_blue.xml
@@ -21,7 +21,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/install-1.6.0.0.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/install-1.6.0.0.php
index f8c43f8ef5..dee95a8257 100755
--- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/install-1.6.0.0.php
+++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/install-1.6.0.0.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.4.0.13-1.4.0.14.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.4.0.13-1.4.0.14.php
index 09844425c0..7b278fa139 100644
--- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.4.0.13-1.4.0.14.php
+++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-data-upgrade-1.4.0.13-1.4.0.14.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-install-1.4.0.8.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-install-1.4.0.8.php
index 37a2f800b6..988741b5c1 100644
--- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-install-1.4.0.8.php
+++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-install-1.4.0.8.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.10-1.4.0.11.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.10-1.4.0.11.php
index 144c139f02..e0476b5068 100755
--- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.10-1.4.0.11.php
+++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.10-1.4.0.11.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.11-1.4.0.12.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.11-1.4.0.12.php
index 4bb010134d..5da937e395 100755
--- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.11-1.4.0.12.php
+++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.11-1.4.0.12.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.12-1.4.0.13.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.12-1.4.0.13.php
index 9dc7871211..71682ebb30 100644
--- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.12-1.4.0.13.php
+++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.12-1.4.0.13.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.13-1.4.0.14.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.13-1.4.0.14.php
index 2bd7e40c01..5ac2854e9e 100644
--- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.13-1.4.0.14.php
+++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.13-1.4.0.14.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.8-1.4.0.9.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.8-1.4.0.9.php
index 9773b412ec..a83540cc3b 100755
--- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.8-1.4.0.9.php
+++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.8-1.4.0.9.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.9-1.4.0.10.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.9-1.4.0.10.php
index 80f39d72b7..a06ed8ba61 100755
--- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.9-1.4.0.10.php
+++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.4.0.9-1.4.0.10.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php
index 8a1ac12aad..49b8ddafe3 100755
--- a/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php
+++ b/app/code/core/Mage/XmlConnect/sql/xmlconnect_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_XmlConnect
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/design/adminhtml/default/default/layout/admin.xml b/app/design/adminhtml/default/default/layout/admin.xml
index 0edf5a0577..72d80a01f3 100644
--- a/app/design/adminhtml/default/default/layout/admin.xml
+++ b/app/design/adminhtml/default/default/layout/admin.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/adminnotification.xml b/app/design/adminhtml/default/default/layout/adminnotification.xml
index 508a8645f1..b1fbbf7ee0 100644
--- a/app/design/adminhtml/default/default/layout/adminnotification.xml
+++ b/app/design/adminhtml/default/default/layout/adminnotification.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/authorizenet.xml b/app/design/adminhtml/default/default/layout/authorizenet.xml
index 423270a232..c8a299ed74 100644
--- a/app/design/adminhtml/default/default/layout/authorizenet.xml
+++ b/app/design/adminhtml/default/default/layout/authorizenet.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
diff --git a/app/design/adminhtml/default/default/layout/bundle.xml b/app/design/adminhtml/default/default/layout/bundle.xml
index 9d7e1c3c71..0116e159b4 100644
--- a/app/design/adminhtml/default/default/layout/bundle.xml
+++ b/app/design/adminhtml/default/default/layout/bundle.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/captcha.xml b/app/design/adminhtml/default/default/layout/captcha.xml
index 0615f967d7..56b7b5fc1f 100755
--- a/app/design/adminhtml/default/default/layout/captcha.xml
+++ b/app/design/adminhtml/default/default/layout/captcha.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
diff --git a/app/design/adminhtml/default/default/layout/catalog.xml b/app/design/adminhtml/default/default/layout/catalog.xml
index a52053bff3..b86c9c9014 100644
--- a/app/design/adminhtml/default/default/layout/catalog.xml
+++ b/app/design/adminhtml/default/default/layout/catalog.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/centinel.xml b/app/design/adminhtml/default/default/layout/centinel.xml
index ae1f72f22c..ff0783a980 100644
--- a/app/design/adminhtml/default/default/layout/centinel.xml
+++ b/app/design/adminhtml/default/default/layout/centinel.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
diff --git a/app/design/adminhtml/default/default/layout/cms.xml b/app/design/adminhtml/default/default/layout/cms.xml
index f822d9bdff..67fbc2062d 100644
--- a/app/design/adminhtml/default/default/layout/cms.xml
+++ b/app/design/adminhtml/default/default/layout/cms.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/compiler.xml b/app/design/adminhtml/default/default/layout/compiler.xml
index 51c177ee4c..7ff96fd7fc 100644
--- a/app/design/adminhtml/default/default/layout/compiler.xml
+++ b/app/design/adminhtml/default/default/layout/compiler.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/connect.xml b/app/design/adminhtml/default/default/layout/connect.xml
index f15ca59f47..4bca2a0abe 100644
--- a/app/design/adminhtml/default/default/layout/connect.xml
+++ b/app/design/adminhtml/default/default/layout/connect.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/currencysymbol.xml b/app/design/adminhtml/default/default/layout/currencysymbol.xml
new file mode 100644
index 0000000000..413383259b
--- /dev/null
+++ b/app/design/adminhtml/default/default/layout/currencysymbol.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/design/adminhtml/default/default/layout/customer.xml b/app/design/adminhtml/default/default/layout/customer.xml
index 5b439d8c93..5e5d3f6bdb 100644
--- a/app/design/adminhtml/default/default/layout/customer.xml
+++ b/app/design/adminhtml/default/default/layout/customer.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/dataflow.xml b/app/design/adminhtml/default/default/layout/dataflow.xml
index 534129275b..de0a420ea3 100644
--- a/app/design/adminhtml/default/default/layout/dataflow.xml
+++ b/app/design/adminhtml/default/default/layout/dataflow.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/downloadable.xml b/app/design/adminhtml/default/default/layout/downloadable.xml
index b675fd26e8..51f88f6fdd 100644
--- a/app/design/adminhtml/default/default/layout/downloadable.xml
+++ b/app/design/adminhtml/default/default/layout/downloadable.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/giftmessage.xml b/app/design/adminhtml/default/default/layout/giftmessage.xml
index 1807b0c565..3362fe7da6 100644
--- a/app/design/adminhtml/default/default/layout/giftmessage.xml
+++ b/app/design/adminhtml/default/default/layout/giftmessage.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/index.xml b/app/design/adminhtml/default/default/layout/index.xml
index 4cfe406b76..de77d959ef 100644
--- a/app/design/adminhtml/default/default/layout/index.xml
+++ b/app/design/adminhtml/default/default/layout/index.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/main.xml b/app/design/adminhtml/default/default/layout/main.xml
index eb72265b83..f3ce2d94b7 100644
--- a/app/design/adminhtml/default/default/layout/main.xml
+++ b/app/design/adminhtml/default/default/layout/main.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -124,6 +124,8 @@ Default layout, loads most of the pages
+
+
@@ -174,7 +176,7 @@ Layout for editor element
js_cssprototype/windows/themes/default.css
- js_cssprototype/windows/themes/magento.css
+ lib/prototype/windows/themes/magento.css
diff --git a/app/design/adminhtml/default/default/layout/moneybookers.xml b/app/design/adminhtml/default/default/layout/moneybookers.xml
index 862ab1ad4f..b06e0450be 100644
--- a/app/design/adminhtml/default/default/layout/moneybookers.xml
+++ b/app/design/adminhtml/default/default/layout/moneybookers.xml
@@ -15,7 +15,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/newsletter.xml b/app/design/adminhtml/default/default/layout/newsletter.xml
index 6aedea1f47..bb0d48bd2b 100644
--- a/app/design/adminhtml/default/default/layout/newsletter.xml
+++ b/app/design/adminhtml/default/default/layout/newsletter.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/pagecache.xml b/app/design/adminhtml/default/default/layout/pagecache.xml
index a58dd03f1f..4ce93c3039 100644
--- a/app/design/adminhtml/default/default/layout/pagecache.xml
+++ b/app/design/adminhtml/default/default/layout/pagecache.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/promo.xml b/app/design/adminhtml/default/default/layout/promo.xml
index b76eed4c57..c6f85ea0d8 100644
--- a/app/design/adminhtml/default/default/layout/promo.xml
+++ b/app/design/adminhtml/default/default/layout/promo.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/report.xml b/app/design/adminhtml/default/default/layout/report.xml
index c76ca36561..b1a327731e 100644
--- a/app/design/adminhtml/default/default/layout/report.xml
+++ b/app/design/adminhtml/default/default/layout/report.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/rss.xml b/app/design/adminhtml/default/default/layout/rss.xml
index d2cef7e84e..64bd1e4dd1 100644
--- a/app/design/adminhtml/default/default/layout/rss.xml
+++ b/app/design/adminhtml/default/default/layout/rss.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/sales.xml b/app/design/adminhtml/default/default/layout/sales.xml
index c7ac871b38..be6baa2145 100644
--- a/app/design/adminhtml/default/default/layout/sales.xml
+++ b/app/design/adminhtml/default/default/layout/sales.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/search.xml b/app/design/adminhtml/default/default/layout/search.xml
index 92d266f100..04b7800fa8 100644
--- a/app/design/adminhtml/default/default/layout/search.xml
+++ b/app/design/adminhtml/default/default/layout/search.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/tag.xml b/app/design/adminhtml/default/default/layout/tag.xml
index 1af8f3d49b..d5ed685ffc 100644
--- a/app/design/adminhtml/default/default/layout/tag.xml
+++ b/app/design/adminhtml/default/default/layout/tag.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
diff --git a/app/design/adminhtml/default/default/layout/widget.xml b/app/design/adminhtml/default/default/layout/widget.xml
index 756652ceac..2eba73bb13 100644
--- a/app/design/adminhtml/default/default/layout/widget.xml
+++ b/app/design/adminhtml/default/default/layout/widget.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -47,7 +47,7 @@
jsprototype/window.js
js_cssprototype/windows/themes/default.css
- js_cssprototype/windows/themes/magento.css
+ lib/prototype/windows/themes/magento.css
diff --git a/app/design/adminhtml/default/default/layout/xmlconnect.xml b/app/design/adminhtml/default/default/layout/xmlconnect.xml
index 3bdea0a1f3..9ae04dcf20 100644
--- a/app/design/adminhtml/default/default/layout/xmlconnect.xml
+++ b/app/design/adminhtml/default/default/layout/xmlconnect.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
@@ -80,7 +80,7 @@
js_cssprototype/windows/themes/default.css
- js_cssprototype/windows/themes/magento.css
+ lib/prototype/windows/themes/magento.css
diff --git a/app/design/adminhtml/default/default/template/access_denied.phtml b/app/design/adminhtml/default/default/template/access_denied.phtml
index fd916949f6..0e49161e1e 100644
--- a/app/design/adminhtml/default/default/template/access_denied.phtml
+++ b/app/design/adminhtml/default/default/template/access_denied.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
diff --git a/app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml b/app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml
index 838135e745..79ffafe5fe 100644
--- a/app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml
+++ b/app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
diff --git a/app/design/adminhtml/default/default/template/api/roleinfo.phtml b/app/design/adminhtml/default/default/template/api/roleinfo.phtml
index e74f891234..053723aeba 100644
--- a/app/design/adminhtml/default/default/template/api/roleinfo.phtml
+++ b/app/design/adminhtml/default/default/template/api/roleinfo.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
diff --git a/app/design/adminhtml/default/default/template/api/roles.phtml b/app/design/adminhtml/default/default/template/api/roles.phtml
index 4713c7b0d1..cebb8dcb14 100644
--- a/app/design/adminhtml/default/default/template/api/roles.phtml
+++ b/app/design/adminhtml/default/default/template/api/roles.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
@@ -29,7 +29,7 @@
__('Roles') ?> |
-
+
|
diff --git a/app/design/adminhtml/default/default/template/api/rolesedit.phtml b/app/design/adminhtml/default/default/template/api/rolesedit.phtml
index 07c06c7b75..e031b7da66 100644
--- a/app/design/adminhtml/default/default/template/api/rolesedit.phtml
+++ b/app/design/adminhtml/default/default/template/api/rolesedit.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
diff --git a/app/design/adminhtml/default/default/template/api/rolesusers.phtml b/app/design/adminhtml/default/default/template/api/rolesusers.phtml
index 3727f5c4ac..e09eb58a42 100644
--- a/app/design/adminhtml/default/default/template/api/rolesusers.phtml
+++ b/app/design/adminhtml/default/default/template/api/rolesusers.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
diff --git a/app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml b/app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml
index 57a60860f8..cc042e99e8 100644
--- a/app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml
+++ b/app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
diff --git a/app/design/adminhtml/default/default/template/api/userinfo.phtml b/app/design/adminhtml/default/default/template/api/userinfo.phtml
index c9be39d10b..5290bbcf43 100644
--- a/app/design/adminhtml/default/default/template/api/userinfo.phtml
+++ b/app/design/adminhtml/default/default/template/api/userinfo.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
diff --git a/app/design/adminhtml/default/default/template/api/usernroles.phtml b/app/design/adminhtml/default/default/template/api/usernroles.phtml
index 8106d8e6ff..9ccb82acbf 100644
--- a/app/design/adminhtml/default/default/template/api/usernroles.phtml
+++ b/app/design/adminhtml/default/default/template/api/usernroles.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
diff --git a/app/design/adminhtml/default/default/template/api/userroles.phtml b/app/design/adminhtml/default/default/template/api/userroles.phtml
index e0addd3939..4724e29760 100644
--- a/app/design/adminhtml/default/default/template/api/userroles.phtml
+++ b/app/design/adminhtml/default/default/template/api/userroles.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
diff --git a/app/design/adminhtml/default/default/template/api/users.phtml b/app/design/adminhtml/default/default/template/api/users.phtml
index da6c6b1ade..f4df96e9ef 100644
--- a/app/design/adminhtml/default/default/template/api/users.phtml
+++ b/app/design/adminhtml/default/default/template/api/users.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
@@ -29,7 +29,7 @@
__('Users') ?> |
-
+
|
diff --git a/app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml b/app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml
index 1532c0a9cc..54efe2c88c 100644
--- a/app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml
+++ b/app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
diff --git a/app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml b/app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml
index c05c2ec9c2..c09eccc7dc 100644
--- a/app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml
+++ b/app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
diff --git a/app/design/adminhtml/default/default/template/backup/dialogs.phtml b/app/design/adminhtml/default/default/template/backup/dialogs.phtml
index e19bbc9c94..3db94d4f8e 100644
--- a/app/design/adminhtml/default/default/template/backup/dialogs.phtml
+++ b/app/design/adminhtml/default/default/template/backup/dialogs.phtml
@@ -26,20 +26,59 @@
__("The backup's creation process will take time.")?>
__('You will need to wait when the action ends.')?>
__('Do you really want to proceed?')?>
-
-
-
-
+
+
+
+
+
+
+
+ __('Please specify backup creation options')?>
+
+
+
+
+
diff --git a/app/design/adminhtml/default/default/template/backup/left.phtml b/app/design/adminhtml/default/default/template/backup/left.phtml
index c7d1080d63..f5482bcb5e 100644
--- a/app/design/adminhtml/default/default/template/backup/left.phtml
+++ b/app/design/adminhtml/default/default/template/backup/left.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
diff --git a/app/design/adminhtml/default/default/template/backup/list.phtml b/app/design/adminhtml/default/default/template/backup/list.phtml
index 1a3183d636..b8c912f5ab 100644
--- a/app/design/adminhtml/default/default/template/backup/list.phtml
+++ b/app/design/adminhtml/default/default/template/backup/list.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml b/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml
index f9abd9b342..ef30d7df14 100644
--- a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml b/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml
index 99922bb755..97b50b9515 100644
--- a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml
+++ b/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -28,7 +28,8 @@
getOption(); ?>
getSelections(); ?>
- getRequired()) echo ' class="required"' ?>>getRequired()) echo '*' ?>htmlEscape($_option->getTitle()) ?>
+getSkipSaleableCheck(); ?>
+ getRequired()) echo ' class="required"' ?>>getRequired()) echo '*' ?>escapeHtml($_option->getTitle()) ?>
decoratedIsLast){?> class="last">
|