cancel
Showing results for 
Search instead for 
Did you mean: 

SUPEE 6788 and GIT

SOLVED

SUPEE 6788 and GIT

Is it me or are there no changes to source files after applying SUPEE 6788? If I do a git status after applying the patch none of the files appear to have changed? I manually update .htaccess to block cron.php.. Is this error the problem?

 

 

./PATCH_SUPEE-6788_CE_1.9.0.1_v1-2015-10-26-11-46-45.sh

Checking if patch can be applied/reverted successfully...

ERROR: Patch can't be applied/reverted successfully.

 

patching file .htaccess

Hunk #1 FAILED at 207.

1 out of 1 hunk FAILED -- saving rejects to file .htaccess.rej

patching file .htaccess.sample

patching file app/code/core/Mage/Admin/Model/Block.php

patching file app/code/core/Mage/Admin/Model/Resource/Block.php

patching file app/code/core/Mage/Admin/Model/Resource/Block/Collection.php

patching file app/code/core/Mage/Admin/Model/Resource/Variable.php

patching file app/code/core/Mage/Admin/Model/Resource/Variable/Collection.php

patching file app/code/core/Mage/Admin/Model/Variable.php

patching file app/code/core/Mage/Admin/etc/config.xml

patching file app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.1-1.6.1.2.php

patching file app/code/core/Mage/Adminhtml/Block/Permissions/Block.php

patching file app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit.php

patching file app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit/Form.php

patching file app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php

patching file app/code/core/Mage/Adminhtml/Block/Permissions/Variable.php

patching file app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit.php

patching file app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit/Form.php

patching file app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Grid.php

patching file app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php

patching file app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php

patching file app/code/core/Mage/Adminhtml/etc/adminhtml.xml

patching file app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php

patching file app/code/core/Mage/Core/Controller/Request/Http.php

patching file app/code/core/Mage/Core/Controller/Varien/Router/Admin.php

patching file app/code/core/Mage/Core/Helper/UnserializeArray.php

patching file app/code/core/Mage/Core/Model/Email/Template/Filter.php

patching file app/code/core/Mage/Core/Model/Resource/Setup.php

patching file app/code/core/Mage/Core/etc/config.xml

patching file app/code/core/Mage/Core/etc/system.xml

patching file app/code/core/Mage/Customer/Block/Account/Changeforgotten.php

patching file app/code/core/Mage/Customer/Block/Account/Resetpassword.php

patching file app/code/core/Mage/Customer/controllers/AccountController.php

patching file app/code/core/Mage/Downloadable/Model/Product/Type.php

patching file app/code/core/Mage/Eav/Model/Resource/Attribute/Collection.php

patching file app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php

patching file app/code/core/Mage/Sales/controllers/DownloadController.php

patching file app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php

patching file app/code/core/Zend/Soap/Server.php

patching file app/code/core/Zend/Xml/Exception.php

patching file app/code/core/Zend/Xml/Security.php

patching file app/code/core/Zend/XmlRpc/Request.php

patching file app/code/core/Zend/XmlRpc/Response.php

patching file app/design/adminhtml/default/default/layout/admin.xml

patching file app/design/frontend/base/default/layout/customer.xml

patching file app/design/frontend/base/default/template/customer/form/register.phtml

patching file app/design/frontend/base/default/template/customer/form/resetforgottenpassword.phtml

patching file app/design/frontend/base/default/template/page/js/cookie.phtml

patching file app/design/frontend/base/default/template/persistent/customer/form/register.phtml

patching file app/design/frontend/default/iphone/layout/customer.xml

Hunk #1 succeeded at 155 (offset 14 lines).

Hunk #2 succeeded at 174 (offset 14 lines).

patching file app/design/frontend/default/modern/layout/customer.xml

patching file app/design/frontend/rwd/default/layout/customer.xml

patching file app/design/frontend/rwd/default/template/customer/form/resetforgottenpassword.phtml

patching file app/design/frontend/rwd/default/template/persistent/customer/form/register.phtml

patching file cron.php

Hunk #1 succeeded at 63 (offset 4 lines).

patching file errors/processor.php

patching file lib/Unserialize/Parser.php

patching file lib/Unserialize/Reader/Arr.php

patching file lib/Unserialize/Reader/ArrKey.php

patching file lib/Unserialize/Reader/ArrValue.php

patching file lib/Unserialize/Reader/Bool.php

patching file lib/Unserialize/Reader/Dbl.php

patching file lib/Unserialize/Reader/Int.php

patching file lib/Unserialize/Reader/Str.php

patching file lib/Varien/Data/Collection/Db.php

8 REPLIES

Re: SUPEE 6788 and GIT

Hi @DigitalD1982,

 

A list of the changes (there're quite a few) to 1.9.2.1 has been published on GIT: https://gist.github.com/gwillem/dd421fef3a6370097a93

 

Here're details of the changes: http://support.hypernode.com/knowledgebase/how-to-install-magento-patch-supee-6788/

 

Hope that helps,

Andy

 

 

 

Re: SUPEE 6788 and GIT

It's possibly due to changes in your .htaccess or .htaccess.sample.  See http://magento.stackexchange.com/questions/87900/why-does-patch-supee-6788-appear-to-have-no-effect-...

Re: SUPEE 6788 and GIT

Hello, posting this query here since this is the only change to the site. The applying of the security patch.

The Create an Account screen flashes after pressing Submit.

The database shows NULL for new user account creation:

|      536 |              1 |            4 |         1 | NULL                                                              |
|      537 |              1 |            6 |         1 | NULL                                                              |
|      538 |              1 |            8 |         1 | NULL                                                              |
|      539 |              1 |           15 |         1 | NULL   



Thank you,
Jeff Carpio

Re: SUPEE 6788 and GIT

So, looks like if the patch to .htaccess fails than the entire patch is not installed.. Hence why git was seeing no changes. Overwrote the .htaccess with the original and then applied the patch and everything worked.

 

Thanks!

Re: SUPEE 6788 and GIT

Would this be a logical next step,
 sh patch-file-name.sh -R 
, or not advisable for this patch?

Re: SUPEE 6788 and GIT

@mjcarpio If you're experiencing issues due to patch 6788, reverting it is safe. The patch does not modify existing DB tables; it only creates new ones. If the new code is not in place to use them, they will simply exist in the DB, but no code will read them.

 

Have a look at the update script from the patch:

 

https://gist.github.com/gwillem/dd421fef3a6370097a93#file-6788-diff-L471

Re: SUPEE 6788 and GIT

Hi nrml, I had the exact same error when i tried to apply the patch, first time I have an issue with a patch, can you please tell me exactly what you did to solve it?? I was reading you overwrote the .htaccess, can you give some more details about it??

 

Thanks!!!

Re: SUPEE 6788 and GIT

Hello All,

I just wanted to update that my issue looks to be resolved. The issue was creating a new user account (frontend) after clicking on Submit the screen would flash back to the account create screen and no user was created.

This worked for me....
-rw-rw-rw- 1 apache apache 37721 Oct 28 00:29 0_AccountController.php
-rw-r--r-- 1 apache apache 36157 Oct 28 19:02 AccountController.php

I am assuming the AccountController.php file was upgraded during the patch install.

Thank you,
Jeff Carpio