Skip to content

Instantly share code, notes, and snippets.

@sprankhub

sprankhub/magento-1.9.2.0-1.9.2.1.diff

Last active August 29, 2015 14:26
Show Gist options
  • Save sprankhub/196a95fc3f1664f69f08 to your computer and use it in GitHub Desktop.
Save sprankhub/196a95fc3f1664f69f08 to your computer and use it in GitHub Desktop.
Download ZIP
Magento 1.9.2.0 - 1.9.2.1 Diff
Raw
magento-1.9.2.0-1.9.2.1.diff
diff -rw magento1920/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php magento1921/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php
236,238c236,238
< $phpAuthUser = $this->getController()->getRequest()->getServer('PHP_AUTH_USER', false);
< $phpAuthPw = $this->getController()->getRequest()->getServer('PHP_AUTH_PW', false);
< $scheme = $this->getController()->getRequest()->getScheme();
---
> $phpAuthUser = rawurlencode($this->getController()->getRequest()->getServer('PHP_AUTH_USER', false));
> $phpAuthPw = rawurlencode($this->getController()->getRequest()->getServer('PHP_AUTH_PW', false));
> $scheme = rawurlencode($this->getController()->getRequest()->getScheme());
diff -rw magento1920/app/code/core/Mage/Catalog/etc/api.xml magento1921/app/code/core/Mage/Catalog/etc/api.xml
166c166
< <multiUpdate translate="title" module="Mage_Catalog">
---
> <multiUpdate translate="title" module="catalog">
diff -rw magento1920/app/code/core/Mage/Catalog/Helper/Product/Compare.php magento1921/app/code/core/Mage/Catalog/Helper/Product/Compare.php
164c164
< if ($this->_logCondition->isVisitorLogEnabled()) {
---
> if ($this->_logCondition->isVisitorLogEnabled() || $this->_customerSession->isLoggedIn()) {
diff -rw magento1920/app/code/core/Mage/Catalog/Model/Product/Api/V2.php magento1921/app/code/core/Mage/Catalog/Model/Product/Api/V2.php
111c111
< if (!$type || !$set || !$sku) {
---
> if (!$type || !$set || !$sku || !is_object($productData)) {
245a246,248
> if (!is_object($productData)) {
> $this->_fault('data_invalid');
> }
diff -rw magento1920/app/code/core/Mage/Cms/Block/Block.php magento1921/app/code/core/Mage/Cms/Block/Block.php
74a75,94
>
> /**
> * Retrieve values of properties that unambiguously identify unique content
> *
> * @return array
> */
> public function getCacheKeyInfo()
> {
> $blockId = $this->getBlockId();
> if ($blockId) {
> $result = array(
> 'CMS_BLOCK',
> $blockId,
> Mage::app()->getStore()->getCode(),
> );
> } else {
> $result = parent::getCacheKeyInfo();
> }
> return $result;
> }
diff -rw magento1920/app/code/core/Mage/Cms/Block/Widget/Block.php magento1921/app/code/core/Mage/Cms/Block/Widget/Block.php
84a85
> $this->addModelTags($block);
89a91,105
> }
>
> /**
> * Retrieve values of properties that unambiguously identify unique content
> *
> * @return array
> */
> public function getCacheKeyInfo()
> {
> $result = parent::getCacheKeyInfo();
> $blockId = $this->getBlockId();
> if ($blockId) {
> $result[] = $blockId;
> }
> return $result;
diff -rw magento1920/app/code/core/Mage/Core/Controller/Request/Http.php magento1921/app/code/core/Mage/Core/Controller/Request/Http.php
300a301
> $host = $_SERVER['HTTP_HOST'];
302,303c303,304
< $host = explode(':', $_SERVER['HTTP_HOST']);
< return $host[0];
---
> $hostParts = explode(':', $_SERVER['HTTP_HOST']);
> $host = $hostParts[0];
305c306,313
< return $_SERVER['HTTP_HOST'];
---
>
> if (strpos($host, ',') !== false || strpos($host, ';') !== false) {
> $response = new Zend_Controller_Response_Http();
> $response->setHttpResponseCode(400)->sendHeaders();
> exit();
> }
>
> return $host;
diff -rw magento1920/app/code/core/Mage/Core/Model/Email/Queue.php magento1921/app/code/core/Mage/Core/Model/Email/Queue.php
44,46d43
< *
< * @category Mage
< * @package Mage_Core
diff -rw magento1920/app/code/core/Mage/Log/Model/Resource/Visitor.php magento1921/app/code/core/Mage/Log/Model/Resource/Visitor.php
128c128
< if ($this->_urlLoggingCondition->isLogEnabled()) {
---
> if ($this->_urlLoggingCondition->isVisitorLogEnabled()) {
diff -rw magento1920/app/code/core/Mage/PageCache/etc/adminhtml.xml magento1921/app/code/core/Mage/PageCache/etc/adminhtml.xml
33c33
< <page_cache translate="title" module="pageCache">
---
> <page_cache translate="title" module="pagecache">
diff -rw magento1920/app/code/core/Mage/Paypal/Model/Express/Checkout.php magento1921/app/code/core/Mage/Paypal/Model/Express/Checkout.php
433,435c433
< if ($exportedShippingAddress
< && $quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON) == 1
< ) {
---
> if ($exportedShippingAddress) {
436a435,436
>
> if ($quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON) == 1) {
441a442,443
> }
>
diff -rw magento1920/app/design/adminhtml/default/default/template/page/js/calendar.phtml magento1921/app/design/adminhtml/default/default/template/page/js/calendar.phtml
26d25
< // no notice of license for now
diff -rw magento1920/app/design/frontend/base/default/template/moneybookers/blank.phtml magento1921/app/design/frontend/base/default/template/moneybookers/blank.phtml
23c23
< * @copyright Copyright (c) 2009 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
---
> * @copyright Copyright (c) 2015 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
diff -rw magento1920/app/design/frontend/base/default/template/moneybookers/form.phtml magento1921/app/design/frontend/base/default/template/moneybookers/form.phtml
23c23
< * @copyright Copyright (c) 2009 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
---
> * @copyright Copyright (c) 2015 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
diff -rw magento1920/app/design/frontend/base/default/template/moneybookers/info.phtml magento1921/app/design/frontend/base/default/template/moneybookers/info.phtml
23c23
< * @copyright Copyright (c) 2009 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
---
> * @copyright Copyright (c) 2015 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
diff -rw magento1920/app/design/frontend/base/default/template/moneybookers/payment.phtml magento1921/app/design/frontend/base/default/template/moneybookers/payment.phtml
23c23
< * @copyright Copyright (c) 2009 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
---
> * @copyright Copyright (c) 2015 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
diff -rw magento1920/app/design/frontend/base/default/template/moneybookers/placeform.phtml magento1921/app/design/frontend/base/default/template/moneybookers/placeform.phtml
23c23
< * @copyright Copyright (c) 2009 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
---
> * @copyright Copyright (c) 2015 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
diff -rw magento1920/app/design/frontend/base/default/template/moneybookers/redirect.phtml magento1921/app/design/frontend/base/default/template/moneybookers/redirect.phtml
23c23
< * @copyright Copyright (c) 2009 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
---
> * @copyright Copyright (c) 2015 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
diff -rw magento1920/app/design/frontend/base/default/template/page/js/cookie.phtml magento1921/app/design/frontend/base/default/template/page/js/cookie.phtml
37,38c37,38
< Mage.Cookies.path = '<?php echo $this->getPath()?>';
< Mage.Cookies.domain = '<?php echo $this->getDomain()?>';
---
> Mage.Cookies.path = '<?php echo Mage::helper('core')->jsQuoteEscape($this->getPath()) ?>';
> Mage.Cookies.domain = '<?php echo Mage::helper('core')->jsQuoteEscape($this->getDomain()) ?>';
diff -rw magento1920/app/locale/en_US/Mage_Adminhtml.csv magento1921/app/locale/en_US/Mage_Adminhtml.csv
21a22
> "- Use the %s buttons to select month","- Use the %s buttons to select month"
78a80
> "Add to category","Add to category"
91a94
> "All Storefronts","All Storefronts"
98a102
> "Already in category","Already in category"
184a189
> "Cancel detach","Cancel detach"
201a207
> "Card Verification Number","Card Verification Number"
238a245
> "Creation date","Creation date"
239a247,250
> "Credit Card Number","Credit Card Number"
> "Credit Card Number: xxxx-%s","Credit Card Number: xxxx-%s"
> "Credit Card Type","Credit Card Type"
> "Credit Card Type: %s","Credit Card Type: %s"
304a316
> "Detach from category","Detach from category"
315a328
> "Download SKUs","Download SKUs"
340a354
> "Enter a comma separated list of SKUs that will always be displayed at the top of your category","Enter a comma separated list of SKUs that will always be displayed at the top of your category"
346a361
> "Excl. Tax:","Excl. Tax:"
347a363,364
> "Expiration Date","Expiration Date"
> "Expiration Date: %s/%s","Expiration Date: %s/%s"
398a416
> "Go to Top","Go to Top"
401a420
> "Google Content","Google Content"
412a432
> "Hero Products","Hero Products"
437a458
> "Incl. Tax:","Incl. Tax:"
538a560
> "Mass Product Assignment","Mass Product Assignment"
547a570,571
> "Move to bottom","Move to bottom"
> "Move to top","Move to top"
553a578,579
> "Name on Card","Name on Card"
> "Name on the Card: %s","Name on the Card: %s"
593a620
> "New attribute set mapping","New attribute set mapping"
603a631
> "No Data","No Data"
604a633
> "No Products","No Products"
639a669
> "Options: ","Options: "
702a733
> "Please note, this category is set to automatically sort. Any drag-and-drop positions will be reset.","Please note, this category is set to automatically sort. Any drag-and-drop positions will be reset."
724a756
> "Please wait","Please wait"
744a777
> "Processing","Processing"
750a784
> "Product not available in this website","Product not available in this website"
859a894,895
> "Search entire store here...","Search entire store here..."
> "Searching...","Searching..."
897a934
> "Sort options","Sort options"
903a941
> "Starting at:","Starting at:"
914a953
> "Storefronts : ","Storefronts : "
919a959,960
> "Switch/Solo card issue number: %s","Switch/Solo card issue number: %s"
> "Switch/Solo card start Date: %s/%s","Switch/Solo card start Date: %s/%s"
920a962,964
> "Switch/Solo/Maestro(UK Domestic) Only","Switch/Solo/Maestro(UK Domestic) Only"
> "Switch/Solo/Maestro(UK Domestic) card issue number: %s","Switch/Solo/Maestro(UK Domestic) card issue number: %s"
> "Switch/Solo/Maestro(UK Domestic) card start Date: %s/%s","Switch/Solo/Maestro(UK Domestic) card start Date: %s/%s"
1027a1072
> "This category is set to only include products matched by rules","This category is set to only include products matched by rules"
1078a1124
> "Unable to save Cron expression","Unable to save Cron expression"
1118a1165
> "Utilities","Utilities"
diff -rw magento1920/app/locale/en_US/Mage_Catalog.csv magento1921/app/locale/en_US/Mage_Catalog.csv
60a61
> "Amount","Amount"
269a271
> "Duplicate amount found.","Duplicate amount found."
419a422
> "Multi update product","Multi update product"
473a477
> "Please refresh ""Product Attributes"" in System -&gt; <a href=""%s"">Index Management</a>","Please refresh ""Product Attributes"" in System -&gt; <a href=""%s"">Index Management</a>"
478a483,484
> "Please set up merge date/time","Please set up merge date/time"
> "Please set up merge date/time later then present date","Please set up merge date/time later then present date"
623a630
> "Search Weight","Search Weight"
742a750
> "Total Qty Content Items","Total Qty Content Items"
811a820,821
> "Website Item Must be checked","Website Item Must be checked"
> "Website Store Must be checked","Website Store Must be checked"
diff -rw magento1920/app/locale/en_US/Mage_CatalogRule.csv magento1921/app/locale/en_US/Mage_CatalogRule.csv
28a29
> "Expiration Date","Expiration Date"
42a44
> "Start Date","Start Date"
47a50
> "There are rules that have been changed but were not applied. Only users with exclusive access can apply rules.","There are rules that have been changed but were not applied. Only users with exclusive access can apply rules."
52a56
> "Type","Type"
diff -rw magento1920/app/locale/en_US/Mage_Checkout.csv magento1921/app/locale/en_US/Mage_Checkout.csv
187a188
> "My Cart Extra Actions","My Cart Extra Actions"
diff -rw magento1920/app/locale/en_US/Mage_Cron.csv magento1921/app/locale/en_US/Mage_Cron.csv
0a1,5
> "10 minutes","10 minutes"
> "15 minutes","15 minutes"
> "20 minutes","20 minutes"
> "30 minutes","30 minutes"
> "5 minutes","5 minutes"
6a12
> "Hourly","Hourly"
8a15
> "Minute Intervals","Minute Intervals"
14a22
> "Unable to delete the cron task.","Unable to delete the cron task."
diff -rw magento1920/app/locale/en_US/Mage_Customer.csv magento1921/app/locale/en_US/Mage_Customer.csv
0a1
> " or "," or "
415a417
> "Unable to save the customer.","Unable to save the customer."
471a474
> "register","register"
diff -rw magento1920/app/locale/en_US/Mage_Dataflow.csv magento1921/app/locale/en_US/Mage_Dataflow.csv
16a17
> "Memory Used: %s","Memory Used: %s"
19a21
> "Processed records: %s","Processed records: %s"
diff -rw magento1920/app/locale/en_US/Mage_Directory.csv magento1921/app/locale/en_US/Mage_Directory.csv
41a42
> "Strikeiron Email Update Warnings","Strikeiron Email Update Warnings"
diff -rw magento1920/app/locale/en_US/Mage_Log.csv magento1921/app/locale/en_US/Mage_Log.csv
7a8
> "Log Cleaning","Log Cleaning"
diff -rw magento1920/app/locale/en_US/Mage_PageCache.csv magento1921/app/locale/en_US/Mage_PageCache.csv
5a6
> "External Page Cache","External Page Cache"
diff -rw magento1920/app/locale/en_US/Mage_Page.csv magento1921/app/locale/en_US/Mage_Page.csv
2a3
> "&copy; 2013 Magento Demo Store. All Rights Reserved.","&copy; 2013 Magento Demo Store. All Rights Reserved."
diff -rw magento1920/app/locale/en_US/Mage_Payment.csv magento1921/app/locale/en_US/Mage_Payment.csv
30a31
> "Credit Card Number: xxxx-%s","Credit Card Number: xxxx-%s"
31a33
> "Credit Card Type: %s","Credit Card Type: %s"
41a44
> "Expiration Date: %s/%s","Expiration Date: %s/%s"
62a66
> "Name on the Card: %s","Name on the Card: %s"
67a72
> "Payment ID: %s","Payment ID: %s"
diff -rw magento1920/app/locale/en_US/Mage_Paypal.csv magento1921/app/locale/en_US/Mage_Paypal.csv
126a127
> "Authorization expired.","Authorization expired."
127a129
> "Authorization was voided by merchant.","Authorization was voided by merchant."
186a189
> "Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?","Connecting to PayPal SFTP server to fetch new reports. Are you sure you want to proceed?"
197a201,202
> "Customer failed to pay.","Customer failed to pay."
> "Customer used non-confirmed address.","Customer used non-confirmed address."
239a245
> "Explanation: %s.","Explanation: %s."
297a304
> "IPN verification ""%s"".","IPN verification ""%s""."
328a336,338
> "Merchant account doesn\'t have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","Merchant account doesn\'t have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview."
> "Merchant account is not verified.","Merchant account is not verified."
> "Merchant denied this pending payment.","Merchant denied this pending payment."
329a340
> "Merchant must upgrade account to Business or Premier status.","Merchant must upgrade account to Business or Premier status."
333a345
> "Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview.","Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview."
434a447
> "Payment is being reviewed by PayPal for risk.","Payment is being reviewed by PayPal for risk."
435a449
> "Payment was made to an email address that is not yet registered or confirmed.","Payment was made to an email address that is not yet registered or confirmed."
447a462
> "Please contact PayPal Customer Service.","Please contact PayPal Customer Service."
473a489
> "Requested %s and configured %s merchant emails do not match.","Requested %s and configured %s merchant emails do not match."
591a608
> "Waiting until Customer\'s eCheck will be cleared.","Waiting until Customer\'s eCheck will be cleared."
609a627
> "Wrong Order ID (%s) specified.","Wrong Order ID (%s) specified."
619a638,642
> "chargeback reimbursed","chargeback reimbursed"
> "chargeback settled","chargeback settled"
> "customer complaint","customer complaint"
> "customer triggered a chargeback","customer triggered a chargeback"
> "customer triggered money-back guarantee","customer triggered money-back guarantee"
620a644,647
> "merchant refunded payment","merchant refunded payment"
> "no reason","no reason"
> "reversal of an adjustment","reversal of an adjustment"
> "unknown reason","unknown reason"
diff -rw magento1920/app/locale/en_US/Mage_Review.csv magento1921/app/locale/en_US/Mage_Review.csv
12a13
> "<a href=""%1$s"" onclick=""this.target=\'blank\'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>","<a href=""%1$s"" onclick=""this.target=\'blank\'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>"
diff -rw magento1920/app/locale/en_US/Mage_Rule.csv magento1921/app/locale/en_US/Mage_Rule.csv
21a22
> "does not contains","does not contains"
23a25,29
> "for","for"
> "for greater than","for greater than"
> "for or greater than","for or greater than"
> "found","found"
> "from","from"
29a36,37
> "not found","not found"
> "not from","not from"
30a39,40
> "was","was"
> "was not","was not"
diff -rw magento1920/app/locale/en_US/Mage_Sales.csv magento1921/app/locale/en_US/Mage_Sales.csv
157a158
> "Create Order","Create Order"
261a263
> "Gift Wrapping for the Entire Order","Gift Wrapping for the Entire Order"
778a781
> "This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed.","This order contains (%s) items and therefore cannot be edited through the admin interface at this time, if you wish to continue editing the (%s) items will be removed, the order will be canceled and a new order will be placed."
diff -rw magento1920/app/locale/en_US/Mage_Shipping.csv magento1921/app/locale/en_US/Mage_Shipping.csv
11a12
> "Custom Value","Custom Value"
diff -rw magento1920/app/locale/en_US/Mage_Weee.csv magento1921/app/locale/en_US/Mage_Weee.csv
23a24
> "Total:","Total:"
diff -rw magento1920/app/locale/en_US/Mage_Wishlist.csv magento1921/app/locale/en_US/Mage_Wishlist.csv
24a25
> "Cannot add the following product(s) to shopping cart: %s.","Cannot add the following product(s) to shopping cart: %s."
39a41
> "Could not find such wishlist","Could not find such wishlist"
72a75
> "Product(s) %s have required options. Each product can only be added individually.","Product(s) %s have required options. Each product can only be added individually."
diff -rw magento1920/app/Mage.php magento1921/app/Mage.php
174c174
< 'patch' => '0',
---
> 'patch' => '1',
diff -rw magento1920/dev/tests/functional/composer.json magento1921/dev/tests/functional/composer.json
22a23
> "Enterprise\\": ["generated/Enterprise/", "tests/app/Enterprise/"],
diff -rw magento1920/dev/tests/functional/tests/app/Mage/Admin/Test/Fixture/Role/RolesResources.php magento1921/dev/tests/functional/tests/app/Mage/Admin/Test/Fixture/Role/RolesResources.php
136a137,139
> 'sales/enterprise_rma',
> 'sales/enterprise_rma/rma_manage',
> 'sales/enterprise_rma/rma_attribute',
146a150,153
> 'sales/enterprise_checkout',
> 'sales/enterprise_checkout/view',
> 'sales/enterprise_checkout/update',
> 'sales/enterprise_giftwrapping',
Nur in magento1921/dev/tests/functional/tests/app/Mage/Adminhtml/Test/TestCase: CreateStoreEntityTest.php.
Nur in magento1921/dev/tests/functional/tests/app/Mage/Bundle/Test/TestCase: AddProductsToMultipleWishListTest.xml.
Nur in magento1921/dev/tests/functional/tests/app/Mage/Bundle/Test/TestCase: CreateRmaEntityOnBackendTest.xml.
diff -rw magento1920/dev/tests/functional/tests/app/Mage/Checkout/Test/Fixture/Cart/Items.php magento1921/dev/tests/functional/tests/app/Mage/Checkout/Test/Fixture/Cart/Items.php
48a49
> 'giftcard' => 'Enterprise\GiftCard\Test\Fixture\Cart\Item',
Nur in magento1921/dev/tests/functional/tests/app/Mage/Downloadable/Test/TestCase: AddProductsToMultipleWishListTest.xml.
diff -rw magento1920/dev/tests/functional/tests/app/Mage/Paypal/Test/Block/AbstractReview.php magento1921/dev/tests/functional/tests/app/Mage/Paypal/Test/Block/AbstractReview.php
93d92
< $this->waitLoader();
diff -rw magento1920/dev/tests/functional/tests/app/Mage/Paypal/Test/Block/Express/Review.php magento1921/dev/tests/functional/tests/app/Mage/Paypal/Test/Block/Express/Review.php
83,92d82
<
< /**
< * Check if 'Place Order' button is visible.
< *
< * @return bool
< */
< public function isPlaceOrderVisible()
< {
< return $this->_rootElement->find($this->placeOrder)->isVisible();
< }
diff -rw magento1920/dev/tests/functional/tests/app/Mage/Paypal/Test/TestCase/TestCreationForExpressCheckoutWithinPayPalButtonTest.xml magento1921/dev/tests/functional/tests/app/Mage/Paypal/Test/TestCase/TestCreationForExpressCheckoutWithinPayPalButtonTest.xml
35c35
< <data name="grandTotal" xsi:type="string">215</data>
---
> <data name="grandTotal" xsi:type="string">115</data>
71c71
< <data name="grandTotal" xsi:type="string">500</data>
---
> <data name="grandTotal" xsi:type="string">400</data>
109c109
< <data name="grandTotal" xsi:type="string">205</data>
---
> <data name="grandTotal" xsi:type="string">105</data>
127c127
< <data name="grandTotal" xsi:type="string">315</data>
---
> <data name="grandTotal" xsi:type="string">215</data>
145c145
< <data name="grandTotal" xsi:type="string">500</data>
---
> <data name="grandTotal" xsi:type="string">400</data>
diff -rw magento1920/dev/tests/functional/tests/app/Mage/Paypal/Test/TestStep/ContinuePayPalCheckoutStep.php magento1921/dev/tests/functional/tests/app/Mage/Paypal/Test/TestStep/ContinuePayPalCheckoutStep.php
32d31
< use Mage\Paypal\Test\Page\PaypalExpressReview;
56,62d54
< * Pay Pal express review page.
< *
< * @var PaypalExpressReview
< */
< protected $paypalExpressReview;
<
< /**
80d71
< * @param PaypalExpressReview $paypalExpressReview
86d76
< PaypalExpressReview $paypalExpressReview,
90d79
< $this->paypalExpressReview = $paypalExpressReview;
107,110c96
< $this->paypalExpressReview->getReviewBlock()->isPlaceOrderVisible();
< $orderId = $this->paypalExpressReview->getReviewBlock()->isPlaceOrderVisible()
< ? null
< : $this->checkoutOnepageSuccess->getSuccessBlock()->getGuestOrderId();
---
> $successBlock = $this->checkoutOnepageSuccess->getSuccessBlock();
112c98
< return ['orderId' => $orderId];
---
> return ['orderId' => $successBlock->isVisible() ? $successBlock->getGuestOrderId() : null];
diff -rw magento1920/dev/tests/functional/tests/app/Mage/SalesRule/Test/Handler/SalesRule/Curl.php magento1921/dev/tests/functional/tests/app/Mage/SalesRule/Test/Handler/SalesRule/Curl.php
95a96,98
> 'Customer Segment' => [
> 'type' => 'enterprise_customersegment/segment_condition_segment',
> ],
Nur in magento1921/dev/tests/functional/tests/app/Mage/Widget/Test/Fixture: Widget.xml.
diff -rw magento1920/dev/tests/functional/tests/app/Mage/Widget/Test/Page/Adminhtml/WidgetInstanceEdit.xml magento1921/dev/tests/functional/tests/app/Mage/Widget/Test/Page/Adminhtml/WidgetInstanceEdit.xml
30a31
> <block name="bannerGrid" class="Enterprise\Banner\Test\Block\Adminhtml\Banner\Grid" locator="#bannerGrid" strategy="css selector"/>
diff -rw magento1920/downloader/Maged/Controller.php magento1921/downloader/Maged/Controller.php
1037c1037
< 'patch' => '0',
---
> 'patch' => '1',
diff -rw magento1920/downloader/template/connect/packages_prepare.phtml magento1921/downloader/template/connect/packages_prepare.phtml
36d35
< <input type="hidden" name="install_package_id" value="<?php echo $this->get('package_id'); ?>">
diff -rw magento1920/errors/design.xml magento1921/errors/design.xml
4c4
< * Magento Enterprise Edition
---
> * {license_notice}
6,25c6,7
< * NOTICE OF LICENSE
< *
< * This source file is subject to the Magento Enterprise Edition License
< * that is bundled with this package in the file LICENSE_EE.txt.
< * It is also available through the world-wide-web at this URL:
< * http://www.magentocommerce.com/license/enterprise-edition
< * If you did not receive a copy of the license and are unable to
< * obtain it through the world-wide-web, please send an email
< * to [email protected] so we can send you a copy immediately.
< *
< * DISCLAIMER
< *
< * Do not edit or add to this file if you wish to upgrade Magento to newer
< * versions in the future. If you wish to customize Magento for your
< * needs please refer to http://www.magentocommerce.com for more information.
< *
< * @category Mage
< * @package Errors
< * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
< * @license http://www.magentocommerce.com/license/enterprise-edition
---
> * @copyright {copyright}
> * @license {license_link}
diff -rw magento1920/js/extjs/fix-defer-before.js magento1921/js/extjs/fix-defer-before.js
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
22c22
< * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
---
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/js/extjs/fix-defer.js magento1921/js/extjs/fix-defer.js
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
22c22
< * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
---
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/js/lib/jquery/noconflict.js magento1921/js/lib/jquery/noconflict.js
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20,22c20,22
< * @category design
< * @package rwd_default
< * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
---
> * @category Mage
> * @package js
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/lib/flex/varien/varien/upload/Uploader.as magento1921/lib/flex/varien/varien/upload/Uploader.as
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category Mage
> * @package Mage_Uploader
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/lib/flex/varien/varien/upload/UploaderEvent.as magento1921/lib/flex/varien/varien/upload/UploaderEvent.as
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category Mage
> * @package Mage_Uploader
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/lib/flex/varien/varien/upload/UploaderSingle.as magento1921/lib/flex/varien/varien/upload/UploaderSingle.as
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category Mage
> * @package Mage_Uploader
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
Nur in magento1920/: pkginfo.
diff -rw magento1920/RELEASE_NOTES.txt magento1921/RELEASE_NOTES.txt
0a1,10
> ==== 1.9.2.1 ====
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ] NOTE: Current Release Notes are maintained at: [
> ] [
> ] http://merch.docs.magento.com/ce/user_guide/Magento_Community_Edition_User_Guide.html#magento/release-notes-ce-1.9.2.html [
> ] [
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
diff -rw magento1920/shell/abstract.php magento1921/shell/abstract.php
13c13
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
19c19
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
23c23
< * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/shell/compiler.php magento1921/shell/compiler.php
13c13
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
19c19
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
23c23
< * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/shell/indexer.php magento1921/shell/indexer.php
13c13
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
19c19
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
23c23
< * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/shell/log.php magento1921/shell/log.php
13c13
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
19c19
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
23c23
< * @copyright Copyright (c) 2009 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/adminhtml/default/default/below_ie7.css magento1921/skin/adminhtml/default/default/below_ie7.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/adminhtml/default/default/boxes.css magento1921/skin/adminhtml/default/default/boxes.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/adminhtml/default/default/custom.css magento1921/skin/adminhtml/default/default/custom.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
22a25
>
diff -rw magento1920/skin/adminhtml/default/default/ie7.css magento1921/skin/adminhtml/default/default/ie7.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/adminhtml/default/default/iestyles.css magento1921/skin/adminhtml/default/default/iestyles.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-catalog.css magento1921/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-catalog.css
0a1,24
> /**
> * Magento
> *
> * NOTICE OF LICENSE
> *
> * This source file is subject to the Academic Free License (AFL 3.0)
> * that is bundled with this package in the file LICENSE_AFL.txt.
> * It is also available through the world-wide-web at this URL:
> * http://opensource.org/licenses/afl-3.0.php
> * If you did not receive a copy of the license and are unable to
> * obtain it through the world-wide-web, please send an email
> * to [email protected] so we can send you a copy immediately.
> *
> * DISCLAIMER
> *
> * Do not edit or add to this file if you wish to upgrade Magento to newer
> * versions in the future. If you wish to customize Magento for your
> * needs please refer to http://www.magento.com for more information.
> *
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
> * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
> */
diff -rw magento1920/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-home.css magento1921/skin/adminhtml/default/default/images/xmlconnect/mobile_preview/mobile-home.css
0a1,24
> /**
> * Magento
> *
> * NOTICE OF LICENSE
> *
> * This source file is subject to the Academic Free License (AFL 3.0)
> * that is bundled with this package in the file LICENSE_AFL.txt.
> * It is also available through the world-wide-web at this URL:
> * http://opensource.org/licenses/afl-3.0.php
> * If you did not receive a copy of the license and are unable to
> * obtain it through the world-wide-web, please send an email
> * to [email protected] so we can send you a copy immediately.
> *
> * DISCLAIMER
> *
> * Do not edit or add to this file if you wish to upgrade Magento to newer
> * versions in the future. If you wish to customize Magento for your
> * needs please refer to http://www.magento.com for more information.
> *
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
> * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
> */
diff -rw magento1920/skin/adminhtml/default/default/lib/prototype/windows/themes/magento.css magento1921/skin/adminhtml/default/default/lib/prototype/windows/themes/magento.css
0a1,24
> /**
> * Magento
> *
> * NOTICE OF LICENSE
> *
> * This source file is subject to the Academic Free License (AFL 3.0)
> * that is bundled with this package in the file LICENSE_AFL.txt.
> * It is also available through the world-wide-web at this URL:
> * http://opensource.org/licenses/afl-3.0.php
> * If you did not receive a copy of the license and are unable to
> * obtain it through the world-wide-web, please send an email
> * to [email protected] so we can send you a copy immediately.
> *
> * DISCLAIMER
> *
> * Do not edit or add to this file if you wish to upgrade Magento to newer
> * versions in the future. If you wish to customize Magento for your
> * needs please refer to http://www.magento.com for more information.
> *
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
> * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
> */
diff -rw magento1920/skin/adminhtml/default/default/menu.css magento1921/skin/adminhtml/default/default/menu.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/adminhtml/default/default/oauth-simple.css magento1921/skin/adminhtml/default/default/oauth-simple.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
21,22c21,22
< * @package base_default
< * @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
---
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/adminhtml/default/default/print.css magento1921/skin/adminhtml/default/default/print.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/adminhtml/default/default/reset.css magento1921/skin/adminhtml/default/default/reset.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/adminhtml/default/default/xmlconnect/boxes.css magento1921/skin/adminhtml/default/default/xmlconnect/boxes.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2010 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/adminhtml/default/default/xmlconnect/dropdown.css magento1921/skin/adminhtml/default/default/xmlconnect/dropdown.css
0a1,24
> /**
> * Magento
> *
> * NOTICE OF LICENSE
> *
> * This source file is subject to the Academic Free License (AFL 3.0)
> * that is bundled with this package in the file LICENSE_AFL.txt.
> * It is also available through the world-wide-web at this URL:
> * http://opensource.org/licenses/afl-3.0.php
> * If you did not receive a copy of the license and are unable to
> * obtain it through the world-wide-web, please send an email
> * to [email protected] so we can send you a copy immediately.
> *
> * DISCLAIMER
> *
> * Do not edit or add to this file if you wish to upgrade Magento to newer
> * versions in the future. If you wish to customize Magento for your
> * needs please refer to http://www.magento.com for more information.
> *
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
> * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
> */
diff -rw magento1920/skin/adminhtml/default/default/xmlconnect/iestyles.css magento1921/skin/adminhtml/default/default/xmlconnect/iestyles.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2010 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/adminhtml/default/default/xmlconnect/mobile-android.css magento1921/skin/adminhtml/default/default/xmlconnect/mobile-android.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2010 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/adminhtml/default/default/xmlconnect/mobile-catalog.css magento1921/skin/adminhtml/default/default/xmlconnect/mobile-catalog.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2010 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/adminhtml/default/default/xmlconnect/mobile-home.css magento1921/skin/adminhtml/default/default/xmlconnect/mobile-home.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2010 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/adminhtml/default/default/xmlconnect/mobile-ipad-catalog.css magento1921/skin/adminhtml/default/default/xmlconnect/mobile-ipad-catalog.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2010 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/adminhtml/default/default/xmlconnect/mobile-ipad-home.css magento1921/skin/adminhtml/default/default/xmlconnect/mobile-ipad-home.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2010 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/adminhtml/default/default/xmlconnect/styles.css magento1921/skin/adminhtml/default/default/xmlconnect/styles.css
0a1,24
> /**
> * Magento
> *
> * NOTICE OF LICENSE
> *
> * This source file is subject to the Academic Free License (AFL 3.0)
> * that is bundled with this package in the file LICENSE_AFL.txt.
> * It is also available through the world-wide-web at this URL:
> * http://opensource.org/licenses/afl-3.0.php
> * If you did not receive a copy of the license and are unable to
> * obtain it through the world-wide-web, please send an email
> * to [email protected] so we can send you a copy immediately.
> *
> * DISCLAIMER
> *
> * Do not edit or add to this file if you wish to upgrade Magento to newer
> * versions in the future. If you wish to customize Magento for your
> * needs please refer to http://www.magento.com for more information.
> *
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
> * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
> */
diff -rw magento1920/skin/frontend/default/blue/css/styles.css magento1921/skin/frontend/default/blue/css/styles.css
21c21
< * @package default_default
---
> * @package default_blue
diff -rw magento1920/skin/frontend/default/blue/css/styles-ie.css magento1921/skin/frontend/default/blue/css/styles-ie.css
21c21
< * @package default_default
---
> * @package default_blue
diff -rw magento1920/skin/frontend/rwd/default/css/styles.css magento1921/skin/frontend/rwd/default/css/styles.css
24a25
> /*! normalize.css v2.0.1 | MIT License | git.io/normalize */
diff -rw magento1920/skin/frontend/rwd/default/scss/vendor/_normalize.scss magento1921/skin/frontend/rwd/default/scss/vendor/_normalize.scss
1,25d0
< //
< // Magento
< //
< // NOTICE OF LICENSE
< //
< // This source file is subject to the Academic Free License (AFL 3.0)
< // that is bundled with this package in the file LICENSE_AFL.txt.
< // It is also available through the world-wide-web at this URL:
< // http://opensource.org/licenses/afl-3.0.php
< // If you did not receive a copy of the license and are unable to
< // obtain it through the world-wide-web, please send an email
< // to [email protected] so we can send you a copy immediately.
< //
< // DISCLAIMER
< //
< // Do not edit or add to this file if you wish to upgrade Magento to newer
< // versions in the future. If you wish to customize Magento for your
< // needs please refer to http://www.magento.com for more information.
< //
< // @category design
< // @package rwd_default
< // @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
< // @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
< //
<
diff -rw magento1920/skin/install/default/default/css/boxes.css magento1921/skin/install/default/default/css/boxes.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/install/default/default/css/clears.css magento1921/skin/install/default/default/css/clears.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/install/default/default/css/ie7minus.css magento1921/skin/install/default/default/css/ie7minus.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/install/default/default/css/iestyles.css magento1921/skin/install/default/default/css/iestyles.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
diff -rw magento1920/skin/install/default/default/css/reset.css magento1921/skin/install/default/default/css/reset.css
12c12
< * to [email protected] so we can send you a copy immediately.
---
> * to [email protected] so we can send you a copy immediately.
18c18
< * needs please refer to http://www.magentocommerce.com for more information.
---
> * needs please refer to http://www.magento.com for more information.
20c20,22
< * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
---
> * @category design
> * @package default_default
> * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
Nur in magento1920/var/package: Cm_RedisSession-1.9.2.0.xml.
Nur in magento1921/var/package: Cm_RedisSession-1.9.2.1.xml.
Nur in magento1920/var/package: Interface_Adminhtml_Default-1.9.2.0.xml.
Nur in magento1921/var/package: Interface_Adminhtml_Default-1.9.2.1.xml.
Nur in magento1920/var/package: Interface_Frontend_Base_Default-1.9.2.0.xml.
Nur in magento1921/var/package: Interface_Frontend_Base_Default-1.9.2.1.xml.
Nur in magento1920/var/package: Interface_Frontend_Default-1.9.2.0.xml.
Nur in magento1921/var/package: Interface_Frontend_Default-1.9.2.1.xml.
Nur in magento1920/var/package: Interface_Frontend_Rwd_Default-1.9.2.0.xml.
Nur in magento1921/var/package: Interface_Frontend_Rwd_Default-1.9.2.1.xml.
Nur in magento1920/var/package: Interface_Install_Default-1.9.2.0.xml.
Nur in magento1921/var/package: Interface_Install_Default-1.9.2.1.xml.
Nur in magento1920/var/package: Lib_Cm-1.9.2.0.xml.
Nur in magento1921/var/package: Lib_Cm-1.9.2.1.xml.
Nur in magento1920/var/package: Lib_Credis-1.9.2.0.xml.
Nur in magento1921/var/package: Lib_Credis-1.9.2.1.xml.
Nur in magento1920/var/package: Lib_Google_Checkout-1.9.2.0.xml.
Nur in magento1921/var/package: Lib_Google_Checkout-1.9.2.1.xml.
Nur in magento1920/var/package: Lib_IDNA2-1.9.2.0.xml.
Nur in magento1921/var/package: Lib_IDNA2-1.9.2.1.xml.
Nur in magento1920/var/package: Lib_Js_Calendar-1.51.1.1.xml.
Nur in magento1921/var/package: Lib_Js_Calendar-1.51.1.2.xml.
Nur in magento1920/var/package: Lib_Js_Ext-1.7.0.0.xml.
Nur in magento1921/var/package: Lib_Js_Ext-1.9.2.1.xml.
Nur in magento1920/var/package: Lib_Js_Mage-1.9.2.0.xml.
Nur in magento1921/var/package: Lib_Js_Mage-1.9.2.1.xml.
Nur in magento1920/var/package: Lib_Js_Prototype-1.7.0.1.xml.
Nur in magento1921/var/package: Lib_Js_Prototype-1.9.2.1.xml.
Nur in magento1920/var/package: Lib_Js_TinyMCE-3.5.11.0.xml.
Nur in magento1921/var/package: Lib_Js_TinyMCE-3.5.11.1.xml.
Nur in magento1920/var/package: Lib_LinLibertineFont-2.8.14.1.xml.
Nur in magento1921/var/package: Lib_LinLibertineFont-2.8.14.2.xml.
Nur in magento1920/var/package: Lib_Mage-1.9.2.0.xml.
Nur in magento1921/var/package: Lib_Mage-1.9.2.1.xml.
Nur in magento1920/var/package: Lib_Magento-1.9.2.0.xml.
Nur in magento1921/var/package: Lib_Magento-1.9.2.1.xml.
Nur in magento1920/var/package: Lib_Pelago-1.9.1.0.xml.
Nur in magento1921/var/package: Lib_Pelago-1.9.2.1.xml.
Nur in magento1920/var/package: Lib_Phpseclib-1.5.0.0.xml.
Nur in magento1921/var/package: Lib_Phpseclib-1.9.2.1.xml.
Nur in magento1920/var/package: Lib_Varien-1.9.2.0.xml.
Nur in magento1921/var/package: Lib_Varien-1.9.2.1.xml.
Nur in magento1920/var/package: Lib_ZF-1.12.10.0.xml.
Nur in magento1921/var/package: Lib_ZF-1.12.10.1.xml.
Nur in magento1920/var/package: Lib_ZF_Locale-1.12.10.0.xml.
Nur in magento1921/var/package: Lib_ZF_Locale-1.12.10.1.xml.
Nur in magento1920/var/package: Mage_All_Latest-1.9.2.0.xml.
Nur in magento1921/var/package: Mage_All_Latest-1.9.2.1.xml.
Nur in magento1920/var/package: Mage_Centinel-1.9.2.0.xml.
Nur in magento1921/var/package: Mage_Centinel-1.9.2.1.xml.
Nur in magento1920/var/package: Mage_Compiler-1.9.2.0.xml.
Nur in magento1921/var/package: Mage_Compiler-1.9.2.1.xml.
Nur in magento1920/var/package: Mage_Core_Adminhtml-1.9.2.0.xml.
Nur in magento1921/var/package: Mage_Core_Adminhtml-1.9.2.1.xml.
Nur in magento1920/var/package: Mage_Core_Modules-1.9.2.0.xml.
Nur in magento1921/var/package: Mage_Core_Modules-1.9.2.1.xml.
Nur in magento1920/var/package: Mage_Downloader-1.9.2.0.xml.
Nur in magento1921/var/package: Mage_Downloader-1.9.2.1.xml.
Nur in magento1920/var/package: Mage_Locale_en_US-1.9.2.0.xml.
Nur in magento1921/var/package: Mage_Locale_en_US-1.9.2.1.xml.
Nur in magento1920/var/package: Magento_Mobile-1.9.2.0.xml.
Nur in magento1921/var/package: Magento_Mobile-1.9.2.1.xml.
Nur in magento1920/var/package: Phoenix_Moneybookers-1.9.2.0.xml.
Nur in magento1921/var/package: Phoenix_Moneybookers-1.9.2.1.xml.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment