Magento发布了针对M1的新安全补丁,以及针对M1和M2的更新。
应用此补丁/升级时,您需要注意哪些常见问题?
Magento 1
https://magento.com/security/patches/supee-11155
Magento 2
这应该是2.1系列中的最后一个版本,该版本将于本月底达到其终止销售状态。
Magento发布了针对M1的新安全补丁,以及针对M1和M2的更新。
应用此补丁/升级时,您需要注意哪些常见问题?
Magento 1
https://magento.com/security/patches/supee-11155
Magento 2
这应该是2.1系列中的最后一个版本,该版本将于本月底达到其终止销售状态。
Answers:
在1.7.0.2 CE上安装了所有以前的修补程序时出错(请参见下文)。
编辑:问题(#1)是由于缺少文件引起的-app / code / core / Mage / Catalog / Model / Product / Option / Type / File.php.orig
通过从补丁脚本中删除第874-1702行(引用File.php.orig)解决了问题(#1)。
问题(#2)是由于补丁和文件格式不正确引起的-js / tiny_mce / plugins / media / js / media.js
通过为补丁文件和media.js文件运行dos2unix命令解决了问题(#2)
解决上述两个问题后,补丁安装成功。
正在检查补丁是否可以成功应用/恢复...
错误:无法成功应用/还原补丁。
补丁文件app / Mage.php补丁文件app / code / core / Mage / Admin / Model / Block.php补丁文件app / code / core / Mage / Admin / Model / User.php补丁文件app / code / core / Mage /AdminNotification/etc/system.xml修补文件app / code / core / Mage / Adminhtml / Block / Api / Role / Grid / User.php修补文件app / code / core / Mage / Adminhtml / Block / Catalog / Product / Edit /Tab/Super/Config.php修补文件app / code / core / Mage / Adminhtml / Block / Newsletter / Queue / Preview.php修补文件app / code / core / Mage / Adminhtml / Block / Newsletter / Template / Preview.php修补文件app / code / core / Mage / Adminhtml / Block / Permissions / Role / Grid / User.php修补文件app / code / core / Mage / Adminhtml / Block / Sales / Creditmemo / Grid.php修补文件app / code / core / Mage / Adminhtml / Block / Sales / Invoice / Grid.php修补文件app / code / core / Mage / Adminhtml / Block / Sales / Order / Create / Header。php补丁文件app / code / core / Mage / Adminhtml / Block / Sales / Order / Creditmemo / Create.php补丁文件app / code / core / Mage / Adminhtml / Block / Sales / Order / Grid.php补丁文件app / code /core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php修补文件app / code / core / Mage / Adminhtml / Block / Sales / Order / Shipment / Create.php修补文件app / code / core / Mage /Adminhtml/Block/Sales/Order/View.php修补文件app / code / core / Mage / Adminhtml / Block / Sales / Shipment / Grid.php修补文件app / code / core / Mage / Adminhtml / Block / Sales / Transactions /Grid.php补丁文件app / code / core / Mage / Adminhtml / Block / System / Email / Template / Preview.php补丁文件app / code / core / Mage / Adminhtml / Block / Template.php补丁文件app / code / core / Mage / Adminhtml / Block / Widget / Grid / Column / Renderer / Abstract。php补丁文件app / code / core / Mage / Adminhtml / Model / LayoutUpdate / Validator.php补丁文件app / code / core / Mage / Adminhtml / Model / System / Config / Backend / Baseurl.php补丁文件app / code / core /Mage/Adminhtml/Model/System/Config/Backend/Locale.php补丁文件app / code / core / Mage / Adminhtml / Model / System / Config / Backend / Serialized / Array.php补丁文件app / code / core / Mage /Adminhtml/controllers/Catalog/Product/AttributeController.php修补文件app / code / core / Mage / Adminhtml / controllers / Catalog / Product / ReviewController.php修补文件app / code / core / Mage / Adminhtml / controllers / Catalog / ProductController .php补丁文件app / code / core / Mage / Adminhtml / controllers / Checkout / AgreementController.php补丁文件app / code / core / Mage / Adminhtml / controllers / Newsletter / TemplateController。php补丁文件app / code / core / Mage / Adminhtml / controllers / Promo / CatalogController.php补丁文件app / code / core / Mage / Adminhtml / controllers / Promo / QuoteController.php补丁文件app / code / core / Mage / Adminhtml /controllers/Sales/Order/CreateController.php修补文件app / code / core / Mage / Adminhtml / controllers / SitemapController.php修补文件app / code / core / Mage / Adminhtml / controllers / System / Email / TemplateController.php修补文件app / code / core / Mage / Catalog / Helper / Product.php下一个php补丁文件app / code / core / Mage / Adminhtml / controllers / System / Email / TemplateController.php补丁文件app / code / core / Mage / Catalog / Helper / Product.php下一个php补丁文件app / code / core / Mage / Adminhtml / controllers / System / Email / TemplateController.php补丁文件app / code / core / Mage / Catalog / Helper / Product.php下一个
补丁程序将删除文件app / code / core / Mage / Catalog / Model / Product / Option / Type / File.php.orig,该文件不存在!
假设-R?[n]
仍要申请吗?[n]正在
跳过补丁。1个大块中有1个忽略了修补文件app / code / core / Mage / Catalog / controllers / Product / CompareController.php修补文件app / code / core / Mage / Checkout / Model / Session.php修补文件app / code / core / Mage / Checkout / controllers / OnepageController。 php补丁文件app / code / core / Mage / Cms / Helper / Data.php补丁文件app / code / core / Mage / Cms / Model / Wysiwyg / Config.php补丁文件app / code / core / Mage / Cms / etc /config.xml补丁文件app / code / core / Mage / Compiler / Model / Process.php补丁文件app / code / core / Mage / Core / Helper / Abstract.php补丁文件app / code / core / Mage / Core / Helper / Data.php补丁文件app / code / core / Mage / Core / Model / Design / Package.php补丁文件app / code / core / Mage / Core / Model / Email / Template / Filter.php补丁文件app / code /core/Mage/Core/Model/File/Validator/AvailablePath.php修补文件app / code / core / Mage / Core / Model / Observer。php补丁文件app / code / core / Mage / Core / etc / config.xml补丁文件app / code / core / Mage / Core / functions.php补丁文件app / code / core / Mage / CurrencySymbol / Model / System / Currencysymbol .php补丁文件app / code / core / Mage / Downloadable / controllers / DownloadController.php补丁文件app / code / core / Mage / SalesRule / Model / Coupon / Massgenerator.php补丁文件app / code / core / Mage / SalesRule / Model / Resource / Report / Rule / Createdat.php修补文件app / code / core / Mage / Sendfriend / etc / config.xml修补文件app / code / core / Mage / Sendfriend / etc / system.xml修补文件app / design /adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml修补文件app / design / adminhtml / default / default / template / catalog / product / helper / gallery。phtml修补文件app / design / adminhtml / default / default / template / catalog / product / tab / inventory.phtml修补文件app / design / adminhtml / default / default / template / currencysymbol / grid.phtml修补文件app / design / adminhtml /default/default/template/customer/tab/addresses.phtml修补文件app / design / adminhtml / default / default / template / customer / tab / view.phtml修补文件app / design / adminhtml / default / default / template / notification /window.phtml修补文件app / design / adminhtml / default / default / template / sales / order / create / data.phtml修补文件app / design / adminhtml / default / default / template / sales / order / view / info.phtml修补文件app / design / adminhtml / default / default / template / system / currency / rate / matrix.phtml修补文件app / locale / en_US / Mage_Adminhtml.csv修补文件app / locale / en_US / Mage_Core。csv修补文件app / locale / en_US / Mage_Sales.csv修补文件app / locale / en_US / Mage_Sitemap.csv修补文件js / mage / adminhtml / wysiwyg / tiny_mce / setup.js修补文件js / tiny_mce / plugins / media / js / media.js
Hunk#1 FAILED at 434. 1个大块FAILED中的1个-将拒绝保存到文件js / tiny_mce / plugins / media / js / media.js.rej修补文件
js / varien / js.js补丁文件lib / phpseclib / PHP / Compat / Function / array_fill.php补丁文件lib / phpseclib / PHP / Compat / Function / bcpowmod.php补丁文件lib / phpseclib / PHP / Compat / Function / str_split .php文件
Magento 1.9.1.0。
补丁已成功应用。
将产品添加到购物车然后登录后,购物车再次为空。
我认为以前没有这个问题,而且似乎已经对 app/code/core/Mage/Checkout/Model/Session.php
更新:
我已经调试了一下。
当我还原它的修补版本时,app/code/core/Mage/Checkout/Model/Session.php
对我来说再次起作用。所以我很确定这与补丁有关。
我最初以为是结合使用的,$quote->unsetData();
但是我的测试尚无定论,因此无论如何也无法删除它。
由于我现在正在休假,因此我有有限的时间进行进一步调查。
更新2:
最新的修补程序(SUPEE-11219)似乎可以解决此问题。包含对app / code / core / Mage / Checkout / Model / Session.php的更改。
在M1上,特别是1.9.2.1 w /应用了所有以前的补丁。我收到以下错误:
Hunk #1 FAILED at 483.
1 out of 1 hunk FAILED -- saving rejects to file js/tiny_mce/plugins/media/js/media.js.rej
当我重新应用补丁文件时,从补丁文件中删除有关该文件的行并手动应用所做的更改对我来说是有效的。
当我查看js / tiny_mce / plugins / media / js / media.js文件与OpenMage Mirror中的文件之间的区别时,它们是相同的文件。
1.9.1.0,成功应用补丁后,登录admin时出现如下错误
Fatal error: Call to undefined function random_int() in /app/code/core/Mage/Core/Helper/Data.php on line 257
怎么修?
在M1,1.9.1.0上,应用了所有先前的补丁程序,我收到许多错误:
checking file app/Mage.php
Hunk #1 FAILED at 813.
1 out of 1 hunk FAILED
checking file app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
Hunk #1 FAILED at 155.
1 out of 1 hunk FAILED
checking file app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php
Hunk #1 FAILED at 180.
1 out of 1 hunk FAILED
checking file app/code/core/Mage/Cms/Helper/Data.php
Hunk #1 FAILED at 37.
Hunk #2 succeeded at 58 with fuzz 2 (offset -16 lines).
1 out of 2 hunks FAILED
checking file app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml
Hunk #1 FAILED at 59.
1 out of 1 hunk FAILED
checking file js/tiny_mce/plugins/media/js/media.js
Hunk #1 FAILED at 483 (different line endings).
1 out of 1 hunk FAILED
看一下补丁文件中的代码本身,似乎与我安装的PHP根本不匹配。
也许我错过了途中某个地方的补丁?
Magento 1.7.0.2
我越来越:
Hunk #1 succeeded at 113 with fuzz 2 (offset 4 lines).
checking file js/tiny_mce/plugins/media/js/media.js
checking file js/varien/js.js
Hunk #1 succeeded at 707 (offset 5 lines).
checking file lib/phpseclib/PHP/Compat/Function/array_fill.php
checking file lib/phpseclib/PHP/Compat/Function/bcpowmod.php
checking file lib/phpseclib/PHP/Compat/Function/str_split.php
这些来自PHP 7.2补丁吗?
更新:看起来那些文件实际上没问题,只是空白偏移量。
问题文件是:
checking file app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php.orig
我认为这是某个修补程序遗留下来的某个文件。新补丁只会删除该文件。我在该目录中没有它,因此出现了错误。
更新:Magento 1.7.0.2上的受影响文件列表
app/Mage.php
app/code/core/Mage/Admin/Model/Block.php
app/code/core/Mage/Admin/Model/User.php
app/code/core/Mage/AdminNotification/etc/system.xml
app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php
app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php
app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php
app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php
app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php
app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php
app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php
app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php
app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php
app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php
app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php
app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php
app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php
app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php
app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php
app/code/core/Mage/Adminhtml/Block/Template.php
app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php
app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php
app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php
app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php
app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php
app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php
app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php
app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php
app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php
app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php
app/code/core/Mage/Adminhtml/controllers/SitemapController.php
app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php
app/code/core/Mage/Catalog/Helper/Product.php
app/code/core/Mage/Catalog/controllers/Product/CompareController.php
app/code/core/Mage/Checkout/Model/Session.php
app/code/core/Mage/Checkout/controllers/OnepageController.php
app/code/core/Mage/Cms/Helper/Data.php
app/code/core/Mage/Cms/Model/Wysiwyg/Config.php
app/code/core/Mage/Cms/etc/config.xml
app/code/core/Mage/Compiler/Model/Process.php
app/code/core/Mage/Core/Helper/Abstract.php
app/code/core/Mage/Core/Helper/Data.php
app/code/core/Mage/Core/Model/Design/Package.php
app/code/core/Mage/Core/Model/Email/Template/Filter.php
app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php
app/code/core/Mage/Core/Model/Observer.php
app/code/core/Mage/Core/etc/config.xml
app/code/core/Mage/Core/functions.php
app/code/core/Mage/CurrencySymbol/Model/System/Currencysymbol.php
app/code/core/Mage/Downloadable/controllers/DownloadController.php
app/code/core/Mage/SalesRule/Model/Coupon/Massgenerator.php
app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php
app/code/core/Mage/Sendfriend/etc/config.xml
app/code/core/Mage/Sendfriend/etc/system.xml
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml
app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml
app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml
app/design/adminhtml/default/default/template/currencysymbol/grid.phtml
app/design/adminhtml/default/default/template/customer/tab/addresses.phtml
app/design/adminhtml/default/default/template/customer/tab/view.phtml
app/design/adminhtml/default/default/template/notification/window.phtml
app/design/adminhtml/default/default/template/sales/order/create/data.phtml
app/design/adminhtml/default/default/template/sales/order/view/info.phtml
app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml
app/etc/applied.patches.list
app/locale/en_US/Mage_Adminhtml.csv
app/locale/en_US/Mage_Core.csv
app/locale/en_US/Mage_Sales.csv
app/locale/en_US/Mage_Sitemap.csv
js/mage/adminhtml/wysiwyg/tiny_mce/setup.js
js/mage/adminhtml/wysiwyg/tiny_mce/setup.js.orig
js/tiny_mce/plugins/media/js/media.js
js/varien/js.js
js/varien/js.js.orig
lib/phpseclib/PHP/Compat/Function/array_fill.php
lib/phpseclib/PHP/Compat/Function/bcpowmod.php
lib/phpseclib/PHP/Compat/Function/str_split.php
在M1版本1.9.4.0中,应用了所有先前的补丁,我得到以下错误
checking file app/Mage.php
Hunk #1 FAILED at 816.
1 out of 1 hunk FAILED
从补丁文件中可以看到,它正在寻找
diff --git app/Mage.php app/Mage.php
index 1136f6e9351..eb9e6db3a9e 100644
--- app/Mage.php
+++ app/Mage.php
@@ -816,9 +816,9 @@ final class Mage
',',
(string) self::getConfig()->getNode('dev/log/allowedFileExtensions', Mage_Core_Model_Store::DEFAULT_CODE)
);
- $logValidator = new Zend_Validate_File_Extension($_allowedFileExtensions);
$logDir = self::getBaseDir('var') . DS . 'log';
- if (!$logValidator->isValid($logDir . DS . $file)) {
+ $validatedFileExtension = pathinfo($file, PATHINFO_EXTENSION);
+ if (!$validatedFileExtension || !in_array($validatedFileExtension, $_allowedFileExtensions)) {
return;
}
但是,这就是我所拥有的
}
try {
if (!isset($loggers[$file])) {
$logDir = self::getBaseDir('var') . DS . 'log';
$logFile = $logDir . DS . $file;
if (!is_dir($logDir)) {
mkdir($logDir);
我在https://raw.githubusercontent.com/OpenMage/magento-mirror/1.9.4.0/app/Mage.php上确认我们具有正确的代码和版本。
如果找到解决方案将更新
使用open-mage-lts 1.9.4.1
检查文件app / design / adminhtml / default / default / template / catalog / product / helper / gallery.phtml Hunk#1 FAILED at59。1之1 Hunk FAILED
将-lts与核心进行比较:
00:20 $ diff app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml /tmp/gallery.phtml
62c62
< <th><?php echo str_replace("<br/>","<br/>",$this->escapeHtml($type['label'])); ?></th>
---
> <th><?php echo $this->escapeHtml($type['label']); ?></th>
该PR在-lts中引入
https://github.com/OpenMage/magento-lts/pull/596
https://github.com/OpenMage/magento-lts/pull/788
补丁代码:
- <th><?php echo $this->escapeHtml($type['label']); ?></th>
+ <th><?php echo $this->escapeHtml($type['label'], array('br')); ?></th>
SUPEE-11155(CE / EE)缺少的一点是,在Mage_Catalog_Helper_Product
类文件getDefaultProductValue
上引入了方法,并且依赖于DEFAULT_QTY
常量。
问题在于,此变量在许多不同的修补程序文件中不存在,仅在其中几个文件中存在:https : //ibb.co/LzcL0gn
我们可以自己打补丁吗?Magento,您知道吗?
全部Thx
只是我还是这看起来不像是虫子?
PATCH_SUPEE-11155_EE_1.14.2.0_v3-2019-06-18-08-46-48.sh
我在这里想念什么吗?
1026 diff --git app/code/core/Mage/Catalog/Helper/Product.php app/code/core/Mage/Catalog/Helper/Product.php
1027 index 45756bf74dc..476483f35bb 100755
1028 --- app/code/core/Mage/Catalog/Helper/Product.php
1029 +++ app/code/core/Mage/Catalog/Helper/Product.php
1030 @@ -485,4 +485,41 @@ class Mage_Catalog_Helper_Product extends Mage_Core_Helper_Url
1031 {
1032 return $this->_skipSaleableCheck;
1033 }
1034 +
1035 + /**
1036 + * Get default product value by field name
1037 + *
1038 + * @param string $fieldName
1039 + * @param string $productType
1040 + * @return int
1041 + */
1042 + public function getDefaultProductValue($fieldName, $productType)
1043 + {
1044 + $fieldData = $this->getFieldset($fieldName) ? (array) $this->getFieldset($fieldName) : null;
1045 + if (
1046 + count($fieldData)
1047 + && array_key_exists($productType, $fieldData['product_type'])
1048 + && (bool)$fieldData['use_config']
1049 + ) {
1050 + return $fieldData['inventory'];
1051 + }
1052 + return self::DEFAULT_QTY;
1053 + }
1054 +
1055 + /**
1056 + * Return array from config by fieldset name and area
1057 + *
1058 + * @param null|string $field
1059 + * @param string $fieldset
1060 + * @param string $area
1061 + * @return array|null
1062 + */
1063 + public function getFieldset($field = null, $fieldset = 'catalog_product_dataflow', $area = 'admin')
1064 + {
1065 + $fieldsetData = Mage::getConfig()->getFieldset($fieldset, $area);
1066 + if ($fieldsetData) {
1067 + return $fieldsetData ? $fieldsetData->$field : $fieldsetData;
1068 + }
1069 + return $fieldsetData;
1070 + }
的好消息是,它只能通过在代码中一个区域打来电话,只要你有一个有效的产品ID,你就不会调用此函数。但是,如果没有有效的产品ID,或者有人尝试根据其设计方式使用此功能,则可能会出现问题。
app / design / adminhtml / default / default / template / catalog / product / tab / inventory.phtml
<?php echo (bool)$this->getProduct()->getId() ? (int)$this->getFieldValue('min_sale_qty') : Mage::helper('catalog/product')->getDefaultProductValue('min_sale_qty', $this->getProduct()->getTypeId()) ?>
对于使用PHP 5.3(或低于5.4)的用户,此处是您需要更改的部分补丁。
供参考,这是用于PATCH_SUPEE-11155_CE_1.7.0.2_v4-2019-08-01-03-58-34
app / code / core / Mage / Adminhtml / controllers / Newsletter / TemplateController.php
$allowedHtmlTags = ['text', 'styles'];
FIX:
$allowedHtmlTags = array('text', 'styles');
app / code / core / Mage / Adminhtml / controllers / System / Email / TemplateController.php
$allowedHtmlTags = ['template_text', 'styles']
FIX:
$allowedHtmlTags = array('template_text', 'styles');
应用程序/代码/核心/法师/厘米/帮助器/Data.php
$statusSwf = $statusSwf->asArray()[0];
FIX:
$statusSwf = $statusSwf->asArray();
$statusSwf = $statusSwf[0];
注意:如果要在补丁文件中更改这些位置,请记住也要更改长度位置,因为要在补丁文件中添加换行符。例如,上面提到的最后一个:
@@ -74,4 +75,19 @@ class Mage_Cms_Helper_Data extends Mage_Core_Helper_Abstract
change to
@@ -74,4 +75,20 @@ class Mage_Cms_Helper_Data extends Mage_Core_Helper_Abstract
^^ incremented
使用Inchoo PHP7模块运行PHP 7.0.x的EE 1.13.1.0:
促销>购物车规则(也可能是其他规则):您无法保存规则,将引发异常“指定了错误的规则”。
我们通过用1.14.xx中的一个重写Mage_Adminhtml_Helper_Data :: removeTags解决了这一问题(我使用1.14.4.0-不确定更改它的确切版本)。
更新后的版本:
public function removeTags($html)
{
$html = preg_replace_callback(
"# <(?![/a-z]) | (?<=\s)>(?![a-z]) #xi",
function ($matches) {
return htmlentities($matches[0]);
},
$html
);
$html = strip_tags($html);
return htmlspecialchars_decode($html);
}
与@Mat有相同的问题
On M1, 1.9.1.0 with all previous patches applied, I get numerous errors:
我的行结尾未在回购上设置为unix / macosx(另一个使用Win-dows的开发人员)。
使用dos2unix转换必要的文件并工作。
作为@chaoticgeek,我有:
Hunk #1 FAILED at 483.
1 out of 1 hunk FAILED -- saving rejects to file js/tiny_mce/plugins/media/js/media.js.rej
到目前为止,它已在所有存储库(6)上发生,分别为1.9.2.4、1.9.3.8 x 2、1.9.3.2 x 2和1.9.2.1。
app / code / core / Mage / Adminhtml / controllers / System / ConfigController.php
更改为:
-> setGroupsSelector($ groups)到-> setGroups($ groups)
我目前在v1.9.3.1上遇到了一些冲突。我正在使用补丁的第三个版本(请参阅文件名):
编辑:经过一些检查,我们实际上缺少一些以前的补丁。稍后将更新。
PATCH_SUPEE-11155_CE_1.9.3.1_v3-2019-06-18-08-15-43.sh: 14: PATCH_SUPEE-11155_CE_1.9.3.1_v3-2019-06-18-08-15-43.sh: 127: not found
PATCH_SUPEE-11155_CE_1.9.3.1_v3-2019-06-18-08-15-43.sh: 14: PATCH_SUPEE-11155_CE_1.9.3.1_v3-2019-06-18-08-15-43.sh: 127: not found
PATCH_SUPEE-11155_CE_1.9.3.1_v3-2019-06-18-08-15-43.sh: 25: PATCH_SUPEE-11155_CE_1.9.3.1_v3-2019-06-18-08-15-43.sh: 0: not found
Checking if patch can be applied/reverted successfully...
-e ERROR: Patch can\'t be applied/reverted successfully.
checking file app/Mage.php
checking file app/code/core/Mage/Admin/Model/Block.php
checking file app/code/core/Mage/Admin/Model/User.php
Hunk #1 succeeded at 586 (offset -4 lines).
checking file app/code/core/Mage/AdminNotification/etc/system.xml
checking file app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php
checking file app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
Hunk #1 FAILED at 155.
1 out of 1 hunk FAILED
checking file app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php
checking file app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php
checking file app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php
checking file app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php
checking file app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php
checking file app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php
checking file app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php
checking file app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php
checking file app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php
checking file app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php
checking file app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php
checking file app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php
checking file app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php
checking file app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php
checking file app/code/core/Mage/Adminhtml/Block/Template.php
checking file app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Abstract.php
checking file app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php
Hunk #1 FAILED at 180.
1 out of 1 hunk FAILED
1 out of 1 hunk FAILED
checking file app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php
checking file app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php
checking file app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php
checking file app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php
checking file app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php
checking file app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
checking file app/code/core/Mage/Adminhtml/controllers/Checkout/AgreementController.php
checking file app/code/core/Mage/Adminhtml/controllers/Newsletter/TemplateController.php
checking file app/code/core/Mage/Adminhtml/controllers/Promo/CatalogController.php
checking file app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php
checking file app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php
checking file app/code/core/Mage/Adminhtml/controllers/SitemapController.php
checking file app/code/core/Mage/Adminhtml/controllers/System/Email/TemplateController.php
checking file app/code/core/Mage/Catalog/Helper/Product.php
checking file app/code/core/Mage/Catalog/controllers/Product/CompareController.php
checking file app/code/core/Mage/Checkout/Model/Session.php
checking file app/code/core/Mage/Checkout/controllers/OnepageController.php
Hunk #1 succeeded at 570 (offset 8 lines).
checking file app/code/core/Mage/Cms/Helper/Data.php
checking file app/code/core/Mage/Cms/Model/Wysiwyg/Config.php
checking file app/code/core/Mage/Cms/etc/config.xml
checking file app/code/core/Mage/Compiler/Model/Process.php
checking file app/code/core/Mage/Core/Helper/Abstract.php
checking file app/code/core/Mage/Core/Helper/Data.php
checking file app/code/core/Mage/Core/Model/Design/Package.php
checking file app/code/core/Mage/Core/Model/Email/Template/Filter.php
checking file app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php
checking file app/code/core/Mage/Core/Model/Observer.php
checking file app/code/core/Mage/Core/etc/config.xml
checking file app/code/core/Mage/Core/functions.php
checking file app/code/core/Mage/CurrencySymbol/Model/System/Currencysymbol.php
checking file app/code/core/Mage/Downloadable/controllers/DownloadController.php
checking file app/code/core/Mage/SalesRule/Model/Coupon/Massgenerator.php
checking file app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php
checking file app/code/core/Mage/Sendfriend/etc/config.xml
checking file app/code/core/Mage/Sendfriend/etc/system.xml
checking file app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml
checking file app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml
Hunk #1 FAILED at 59.
1 out of 1 hunk FAILED
checking file app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml
checking file app/design/adminhtml/default/default/template/currencysymbol/grid.phtml
checking file app/design/adminhtml/default/default/template/customer/tab/addresses.phtml
checking file app/design/adminhtml/default/default/template/customer/tab/view.phtml
checking file app/design/adminhtml/default/default/template/notification/window.phtml
checking file app/design/adminhtml/default/default/template/sales/order/create/data.phtml
checking file app/design/adminhtml/default/default/template/sales/order/view/info.phtml
Hunk #4 succeeded at 176 (offset 22 lines).
Hunk #5 succeeded at 189 with fuzz 1 (offset 22 lines).
checking file app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml
checking file app/locale/en_US/Mage_Adminhtml.csv
checking file app/locale/en_US/Mage_Core.csv
checking file app/locale/en_US/Mage_Sales.csv
checking file app/locale/en_US/Mage_Sitemap.csv
checking file js/mage/adminhtml/wysiwyg/tiny_mce/setup.js
checking file js/tiny_mce/plugins/media/js/media.js
checking file js/varien/js.js
checking file lib/phpseclib/PHP/Compat/Function/array_fill.php
checking file lib/phpseclib/PHP/Compat/Function/bcpowmod.php
checking file lib/phpseclib/PHP/Compat/Function/str_split.php
从1.9.4.1更新到1.9.4.2时,我目前面临这个问题。因此,管理员订单创建和前端结帐现在会导致500个内部服务器错误,而不会记录或显示任何错误。