Mage_Core_Modules - Version 1.8.0.0

.htaccess.sample +1 -2

RELEASE_NOTES.txt +9 -0

app/Mage.php +3 -3

app/code/core/Mage/Admin/Helper/Data.php +1 -1

app/code/core/Mage/Admin/Model/Acl.php +1 -1

app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php +1 -1

app/code/core/Mage/Admin/Model/Acl/Assert/Time.php +1 -1

app/code/core/Mage/Admin/Model/Acl/Resource.php +1 -1

app/code/core/Mage/Admin/Model/Acl/Role.php +1 -1

app/code/core/Mage/Admin/Model/Acl/Role/Generic.php +1 -1

app/code/core/Mage/Admin/Model/Acl/Role/Group.php +1 -1

app/code/core/Mage/Admin/Model/Acl/Role/Registry.php +1 -1

app/code/core/Mage/Admin/Model/Acl/Role/User.php +1 -1

app/code/core/Mage/Admin/Model/Config.php +1 -1

app/code/core/Mage/Admin/Model/Mysql4/Acl.php +1 -1

app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php +1 -1

app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php +1 -1

app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php +1 -1

app/code/core/Mage/Admin/Model/Mysql4/Role.php +1 -1

app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php +1 -1

app/code/core/Mage/Admin/Model/Mysql4/Roles.php +1 -1

app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php +1 -1

app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php +1 -1

app/code/core/Mage/Admin/Model/Mysql4/Rules.php +1 -1

app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php +1 -1

app/code/core/Mage/Admin/Model/Mysql4/User.php +1 -1

app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php +1 -1

app/code/core/Mage/Admin/Model/Observer.php +1 -1

app/code/core/Mage/Admin/Model/Resource/Acl.php +1 -1

app/code/core/Mage/Admin/Model/Resource/Acl/Role.php +1 -1

app/code/core/Mage/Admin/Model/Resource/Acl/Role/Collection.php +1 -1

app/code/core/Mage/Admin/Model/Resource/Permissions/Collection.php +1 -1

app/code/core/Mage/Admin/Model/Resource/Role.php +1 -1

app/code/core/Mage/Admin/Model/Resource/Role/Collection.php +1 -1

app/code/core/Mage/Admin/Model/Resource/Roles.php +1 -1

app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php +1 -1

app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php +1 -1

app/code/core/Mage/Admin/Model/Resource/Rules.php +1 -1

app/code/core/Mage/Admin/Model/Resource/Rules/Collection.php +1 -1

app/code/core/Mage/Admin/Model/Resource/User.php +6 -7

app/code/core/Mage/Admin/Model/Resource/User/Collection.php +1 -1

app/code/core/Mage/Admin/Model/Role.php +1 -1

app/code/core/Mage/Admin/Model/Roles.php +1 -1

app/code/core/Mage/Admin/Model/Rules.php +1 -1

app/code/core/Mage/Admin/Model/Session.php +1 -1

app/code/core/Mage/Admin/Model/User.php +22 -6

app/code/core/Mage/Admin/data/admin_setup/data-install-1.6.0.0.php +1 -1

app/code/core/Mage/Admin/etc/config.xml +2 -2

app/code/core/Mage/Admin/sql/admin_setup/install-1.6.0.0.php +1 -1

app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php +1 -1

app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php +1 -1

app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.1-0.7.2.php +1 -1

app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1

app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.0.0-1.6.1.0.php +1 -1

app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.0-1.6.1.1.php +38 -0

app/code/core/Mage/AdminNotification/Helper/Data.php +1 -1

app/code/core/Mage/AdminNotification/Model/Feed.php +1 -1

app/code/core/Mage/AdminNotification/Model/Inbox.php +1 -1

app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php +1 -1

app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php +1 -1

app/code/core/Mage/AdminNotification/Model/Observer.php +1 -1

app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php +1 -1

app/code/core/Mage/AdminNotification/Model/Resource/Inbox/Collection.php +1 -1

app/code/core/Mage/AdminNotification/Model/Survey.php +1 -1

app/code/core/Mage/AdminNotification/etc/adminhtml.xml +1 -1

app/code/core/Mage/AdminNotification/etc/config.xml +1 -1

app/code/core/Mage/AdminNotification/etc/system.xml +1 -1

app/code/core/Mage/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php +1 -1

app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php +1 -1

app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1

app/code/core/Mage/Api/Controller/Action.php +1 -1

app/code/core/Mage/Api/Exception.php +1 -1

app/code/core/Mage/Api/Helper/Data.php +45 -34

app/code/core/Mage/Api/Model/Acl.php +1 -1

app/code/core/Mage/Api/Model/Acl/Assert/Ip.php +1 -1

app/code/core/Mage/Api/Model/Acl/Assert/Time.php +1 -1

app/code/core/Mage/Api/Model/Acl/Resource.php +1 -1

app/code/core/Mage/Api/Model/Acl/Role.php +1 -1

app/code/core/Mage/Api/Model/Acl/Role/Generic.php +1 -1

app/code/core/Mage/Api/Model/Acl/Role/Group.php +1 -1

app/code/core/Mage/Api/Model/Acl/Role/Registry.php +1 -1

app/code/core/Mage/Api/Model/Acl/Role/User.php +1 -1

app/code/core/Mage/Api/Model/Config.php +1 -1

app/code/core/Mage/Api/Model/Mysql4/Acl.php +1 -1

app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php +1 -1

app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php +1 -1

app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php +1 -1

app/code/core/Mage/Api/Model/Mysql4/Role.php +1 -1

app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php +1 -1

app/code/core/Mage/Api/Model/Mysql4/Roles.php +1 -1

app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php +1 -1

app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php +1 -1

app/code/core/Mage/Api/Model/Mysql4/Rules.php +1 -1

app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php +1 -1

app/code/core/Mage/Api/Model/Mysql4/User.php +1 -1

app/code/core/Mage/Api/Model/Mysql4/User/Collection.php +1 -1

app/code/core/Mage/Api/Model/Resource/Abstract.php +1 -1

app/code/core/Mage/Api/Model/Resource/Acl.php +1 -1

app/code/core/Mage/Api/Model/Resource/Acl/Role.php +1 -1

app/code/core/Mage/Api/Model/Resource/Acl/Role/Collection.php +1 -1

app/code/core/Mage/Api/Model/Resource/Permissions/Collection.php +1 -1

app/code/core/Mage/Api/Model/Resource/Role.php +1 -1

app/code/core/Mage/Api/Model/Resource/Role/Collection.php +1 -1

app/code/core/Mage/Api/Model/Resource/Roles.php +1 -1

app/code/core/Mage/Api/Model/Resource/Roles/Collection.php +1 -1

app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php +1 -1

app/code/core/Mage/Api/Model/Resource/Rules.php +1 -1

app/code/core/Mage/Api/Model/Resource/Rules/Collection.php +1 -1

app/code/core/Mage/Api/Model/Resource/User.php +1 -1

app/code/core/Mage/Api/Model/Resource/User/Collection.php +1 -1

app/code/core/Mage/Api/Model/Role.php +1 -1

app/code/core/Mage/Api/Model/Roles.php +1 -1

app/code/core/Mage/Api/Model/Rules.php +1 -1

app/code/core/Mage/Api/Model/Server.php +1 -1

app/code/core/Mage/Api/Model/Server/Adapter/Interface.php +1 -1

app/code/core/Mage/Api/Model/Server/Adapter/Soap.php +1 -1

app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php +1 -1

app/code/core/Mage/Api/Model/Server/Handler.php +1 -1

app/code/core/Mage/Api/Model/Server/Handler/Abstract.php +3 -3

app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php +13 -9

app/code/core/Mage/Api/Model/Server/V2/Handler.php +1 -1

app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php +25 -20

app/code/core/Mage/Api/Model/Server/Wsi/Handler.php +13 -1

app/code/core/Mage/Api/Model/Session.php +1 -1

app/code/core/Mage/Api/Model/User.php +111 -7

app/code/core/Mage/Api/Model/Wsdl/Config.php +1 -1

app/code/core/Mage/Api/Model/Wsdl/Config/Base.php +1 -1

app/code/core/Mage/Api/Model/Wsdl/Config/Element.php +1 -1

app/code/core/Mage/Api/controllers/IndexController.php +1 -1

app/code/core/Mage/Api/controllers/SoapController.php +1 -1

app/code/core/Mage/Api/controllers/V2/SoapController.php +1 -1

app/code/core/Mage/Api/controllers/XmlrpcController.php +1 -1

app/code/core/Mage/Api/etc/adminhtml.xml +1 -1

app/code/core/Mage/Api/etc/api.xml +1 -1

app/code/core/Mage/Api/etc/config.xml +2 -2

app/code/core/Mage/Api/etc/system.xml +1 -1

app/code/core/Mage/Api/sql/api_setup/install-1.6.0.0.php +1 -1

app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php +1 -1

app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php +1 -1

app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php +1 -1

app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1

app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php +41 -0

app/code/core/Mage/Api2/Block/Adminhtml/Attribute.php +1 -1

app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php +1 -1

app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit.php +1 -1

app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit/Form.php +1 -1

app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php +1 -1

app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tab/Resource.php +1 -1

app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tabs.php +1 -1

app/code/core/Mage/Api2/Block/Adminhtml/Permissions/User/Edit/Tab/Roles.php +1 -1

app/code/core/Mage/Api2/Block/Adminhtml/Roles.php +1 -1

app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php +1 -1

app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php +1 -1

app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php +2 -5

app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Resources.php +1 -1

app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.php +1 -1

app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tabs.php +1 -1

app/code/core/Mage/Api2/Exception.php +1 -1

app/code/core/Mage/Api2/Helper/Data.php +1 -1

app/code/core/Mage/Api2/Model/Acl.php +1 -1

app/code/core/Mage/Api2/Model/Acl/Filter.php +1 -1

app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php +1 -1

app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/Operation.php +1 -1

app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php +1 -1

app/code/core/Mage/Api2/Model/Acl/Global.php +1 -1

app/code/core/Mage/Api2/Model/Acl/Global/Role.php +3 -5

app/code/core/Mage/Api2/Model/Acl/Global/Rule.php +1 -1

app/code/core/Mage/Api2/Model/Acl/Global/Rule/Permission.php +1 -1

app/code/core/Mage/Api2/Model/Acl/Global/Rule/Privilege.php +1 -1

app/code/core/Mage/Api2/Model/Acl/Global/Rule/ResourcePermission.php +1 -1

app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php +1 -1

app/code/core/Mage/Api2/Model/Acl/PermissionInterface.php +1 -1

app/code/core/Mage/Api2/Model/Auth.php +1 -1

app/code/core/Mage/Api2/Model/Auth/Adapter.php +1 -1

app/code/core/Mage/Api2/Model/Auth/Adapter/Abstract.php +1 -1

app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php +1 -1

app/code/core/Mage/Api2/Model/Auth/User.php +1 -1

app/code/core/Mage/Api2/Model/Auth/User/Abstract.php +1 -1

app/code/core/Mage/Api2/Model/Auth/User/Admin.php +1 -1

app/code/core/Mage/Api2/Model/Auth/User/Customer.php +1 -1

app/code/core/Mage/Api2/Model/Auth/User/Guest.php +1 -1

app/code/core/Mage/Api2/Model/Config.php +1 -1

app/code/core/Mage/Api2/Model/Dispatcher.php +1 -1

app/code/core/Mage/Api2/Model/Multicall.php +1 -1

app/code/core/Mage/Api2/Model/Observer.php +1 -1

app/code/core/Mage/Api2/Model/Renderer.php +1 -1

app/code/core/Mage/Api2/Model/Renderer/Interface.php +1 -1

app/code/core/Mage/Api2/Model/Renderer/Json.php +1 -1

app/code/core/Mage/Api2/Model/Renderer/Query.php +1 -1

app/code/core/Mage/Api2/Model/Renderer/Xml.php +1 -1

app/code/core/Mage/Api2/Model/Renderer/Xml/Writer.php +1 -1

app/code/core/Mage/Api2/Model/Request.php +1 -1

app/code/core/Mage/Api2/Model/Request/Internal.php +1 -1

app/code/core/Mage/Api2/Model/Request/Interpreter.php +1 -1

app/code/core/Mage/Api2/Model/Request/Interpreter/Interface.php +1 -1

app/code/core/Mage/Api2/Model/Request/Interpreter/Json.php +1 -1

app/code/core/Mage/Api2/Model/Request/Interpreter/Query.php +1 -1

app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.php +1 -1

app/code/core/Mage/Api2/Model/Resource.php +1 -1

app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php +1 -1

app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php +1 -1

app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php +1 -1

app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php +1 -1

app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule.php +1 -1

app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php +1 -1

app/code/core/Mage/Api2/Model/Resource/Setup.php +1 -1

app/code/core/Mage/Api2/Model/Resource/Validator.php +1 -1

app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php +3 -4

app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php +1 -1

app/code/core/Mage/Api2/Model/Response.php +1 -1

app/code/core/Mage/Api2/Model/Route/Abstract.php +1 -1

app/code/core/Mage/Api2/Model/Route/ApiType.php +1 -1

app/code/core/Mage/Api2/Model/Route/Interface.php +1 -1

app/code/core/Mage/Api2/Model/Route/Rest.php +1 -1

app/code/core/Mage/Api2/Model/Router.php +1 -1

app/code/core/Mage/Api2/Model/Server.php +1 -1

app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php +1 -1

app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php +1 -1

app/code/core/Mage/Api2/etc/adminhtml.xml +1 -1

app/code/core/Mage/Api2/etc/config.xml +1 -1

app/code/core/Mage/Api2/sql/api2_setup/install-1.0.0.0.php +1 -1

app/code/core/Mage/Authorizenet/Block/Directpost/Form.php +1 -1

app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php +1 -1

app/code/core/Mage/Authorizenet/Helper/Data.php +3 -2

app/code/core/Mage/Authorizenet/Model/Directpost.php +10 -7

app/code/core/Mage/Authorizenet/Model/Directpost/Observer.php +1 -1

app/code/core/Mage/Authorizenet/Model/Directpost/Request.php +1 -1

app/code/core/Mage/Authorizenet/Model/Directpost/Response.php +1 -1

app/code/core/Mage/Authorizenet/Model/Directpost/Session.php +1 -1

app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php +1 -1

app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php +1 -1

app/code/core/Mage/Authorizenet/etc/config.xml +1 -1

app/code/core/Mage/Authorizenet/etc/system.xml +1 -1

app/code/core/Mage/Backup/Exception.php +1 -1

app/code/core/Mage/Backup/Helper/Data.php +5 -5

app/code/core/Mage/Backup/Model/Backup.php +1 -1

app/code/core/Mage/Backup/Model/Config/Backend/Cron.php +1 -1

app/code/core/Mage/Backup/Model/Config/Source/Type.php +1 -1

app/code/core/Mage/Backup/Model/Db.php +1 -1

app/code/core/Mage/Backup/Model/Fs/Collection.php +1 -1

app/code/core/Mage/Backup/Model/Mysql4/Db.php +1 -1

app/code/core/Mage/Backup/Model/Observer.php +1 -1

app/code/core/Mage/Backup/Model/Resource/Db.php +1 -1

app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php +1 -1

app/code/core/Mage/Backup/etc/adminhtml.xml +1 -1

app/code/core/Mage/Backup/etc/config.xml +1 -1

app/code/core/Mage/Backup/etc/system.xml +1 -1

app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Bundle.php +1 -1

app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php +1 -1

app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php +1 -1

app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php +1 -1

app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php +1 -1

app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php +1 -1

app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php +1 -1

app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php +1 -1

app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php +1 -1

app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php +1 -1

app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php +1 -1

app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php +1 -1

app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php +1 -1

app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php +1 -1

app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php +19 -8

app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php +21 -9

app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php +1 -1

app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php +1 -1

app/code/core/Mage/Bundle/Block/Catalog/Product/View.php +21 -9

app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php +10 -4

app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php +6 -1

app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php +1 -1

app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php +1 -1

app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php +1 -1

app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php +1 -1

app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php +13 -12

app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php +20 -9

app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php +29 -23

app/code/core/Mage/Bundle/Helper/Data.php +1 -1

app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php +1 -1

app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php +1 -1

app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Price.php +1 -1

app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php +1 -1

app/code/core/Mage/Bundle/Model/Mysql4/Option.php +1 -1

app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php +1 -1

app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php +1 -1

app/code/core/Mage/Bundle/Model/Mysql4/Selection.php +1 -1

app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php +1 -1

app/code/core/Mage/Bundle/Model/Observer.php +1 -1

app/code/core/Mage/Bundle/Model/Option.php +1 -1

app/code/core/Mage/Bundle/Model/Price/Index.php +1 -1

app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php +1 -1

app/code/core/Mage/Bundle/Model/Product/Price.php +227 -117

app/code/core/Mage/Bundle/Model/Product/Type.php +3 -8

app/code/core/Mage/Bundle/Model/Resource/Bundle.php +1 -1

app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php +13 -13

app/code/core/Mage/Bundle/Model/Resource/Indexer/Stock.php +1 -1

app/code/core/Mage/Bundle/Model/Resource/Option.php +1 -1

app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php +1 -1

app/code/core/Mage/Bundle/Model/Resource/Price/Index.php +1 -1

app/code/core/Mage/Bundle/Model/Resource/Selection.php +1 -1

app/code/core/Mage/Bundle/Model/Resource/Selection/Collection.php +1 -1

app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php +1 -1

app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php +1 -1

app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php +1 -1

app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php +1 -1

app/code/core/Mage/Bundle/Model/Selection.php +1 -1

app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php +1 -1

app/code/core/Mage/Bundle/Model/Source/Option/Type.php +1 -1

app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php +1 -1

app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php +1 -1

app/code/core/Mage/Bundle/controllers/Product/EditController.php +1 -1

app/code/core/Mage/Bundle/controllers/SelectionController.php +1 -1

app/code/core/Mage/Bundle/data/bundle_setup/data-install-1.6.0.0.php +1 -1

app/code/core/Mage/Bundle/etc/config.xml +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/install-1.6.0.0.php +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-data-upgrade-0.1.13-0.1.14.php +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.10-0.1.11.php +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.11-0.1.12.php +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.12-0.1.13.php +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.7-0.1.8.php +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.8-0.1.9.php +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.9-0.1.10.php +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php +1 -1

app/code/core/Mage/Bundle/sql/bundle_setup/upgrade-1.6.0.0-1.6.0.0.1.php +1 -1

app/code/core/Mage/Captcha/Block/Captcha.php +1 -1

app/code/core/Mage/Captcha/Block/Captcha/Zend.php +1 -1

app/code/core/Mage/Captcha/Helper/Data.php +1 -1

app/code/core/Mage/Captcha/Model/Config/Font.php +1 -1

app/code/core/Mage/Captcha/Model/Config/Form/Abstract.php +1 -1

app/code/core/Mage/Captcha/Model/Config/Form/Backend.php +1 -1

app/code/core/Mage/Captcha/Model/Config/Form/Frontend.php +1 -1

app/code/core/Mage/Captcha/Model/Config/Mode.php +1 -1

app/code/core/Mage/Captcha/Model/Interface.php +1 -1

app/code/core/Mage/Captcha/Model/Observer.php +2 -2

app/code/core/Mage/Captcha/Model/Resource/Log.php +1 -1

app/code/core/Mage/Captcha/Model/Zend.php +6 -2

app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php +1 -1

app/code/core/Mage/Captcha/controllers/RefreshController.php +1 -1

app/code/core/Mage/Captcha/etc/config.xml +1 -1

app/code/core/Mage/Captcha/etc/system.xml +1 -1

app/code/core/Mage/Captcha/sql/captcha_setup/install-1.7.0.0.0.php +1 -1

app/code/core/Mage/Catalog/Block/Breadcrumbs.php +1 -1

app/code/core/Mage/Catalog/Block/Category/View.php +17 -2

app/code/core/Mage/Catalog/Block/Category/Widget/Link.php +1 -1

app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php +1 -1

app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php +1 -1

app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php +1 -1

app/code/core/Mage/Catalog/Block/Layer/Filter/Decimal.php +1 -1

app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php +1 -1

app/code/core/Mage/Catalog/Block/Layer/State.php +1 -1

app/code/core/Mage/Catalog/Block/Layer/View.php +1 -1

app/code/core/Mage/Catalog/Block/Navigation.php +55 -34

app/code/core/Mage/Catalog/Block/Product.php +1 -1

app/code/core/Mage/Catalog/Block/Product/Abstract.php +95 -24

app/code/core/Mage/Catalog/Block/Product/Compare/Abstract.php +1 -1

app/code/core/Mage/Catalog/Block/Product/Compare/List.php +8 -1

app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php +18 -1

app/code/core/Mage/Catalog/Block/Product/Gallery.php +1 -1

app/code/core/Mage/Catalog/Block/Product/List.php +15 -1

app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php +1 -1

app/code/core/Mage/Catalog/Block/Product/List/Promotion.php +1 -1

app/code/core/Mage/Catalog/Block/Product/List/Random.php +1 -1

app/code/core/Mage/Catalog/Block/Product/List/Related.php +11 -1

app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php +1 -1

app/code/core/Mage/Catalog/Block/Product/List/Upsell.php +12 -2

app/code/core/Mage/Catalog/Block/Product/New.php +28 -12

app/code/core/Mage/Catalog/Block/Product/Price.php +25 -2

app/code/core/Mage/Catalog/Block/Product/Price/Template.php +1 -1

app/code/core/Mage/Catalog/Block/Product/Send.php +1 -1

app/code/core/Mage/Catalog/Block/Product/View.php +16 -6

app/code/core/Mage/Catalog/Block/Product/View/Abstract.php +1 -1

app/code/core/Mage/Catalog/Block/Product/View/Additional.php +1 -1

app/code/core/Mage/Catalog/Block/Product/View/Attributes.php +1 -1

app/code/core/Mage/Catalog/Block/Product/View/Description.php +1 -1

app/code/core/Mage/Catalog/Block/Product/View/Media.php +1 -1

app/code/core/Mage/Catalog/Block/Product/View/Options.php +1 -1

app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php +1 -1

app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php +1 -1

app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php +1 -1

app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php +1 -1

app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php +1 -1

app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php +1 -1

app/code/core/Mage/Catalog/Block/Product/View/Price.php +1 -1

app/code/core/Mage/Catalog/Block/Product/View/Tabs.php +1 -1

app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php +1 -1

app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php +1 -1

app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php +1 -1

app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php +1 -1

app/code/core/Mage/Catalog/Block/Product/Widget/Html/Pager.php +299 -0

app/code/core/Mage/Catalog/Block/Product/Widget/Link.php +1 -1

app/code/core/Mage/Catalog/Block/Product/Widget/New.php +151 -8

app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php +1 -1

app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php +1 -1

app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php +1 -1

app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php +1 -1

app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php +1 -1

app/code/core/Mage/Catalog/Block/Widget/Link.php +1 -1

app/code/core/Mage/Catalog/Exception.php +1 -1

app/code/core/Mage/Catalog/Helper/Category.php +1 -1

app/code/core/Mage/Catalog/Helper/Category/Flat.php +39 -19

app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite.php +121 -0

app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite/Interface.php +63 -0

app/code/core/Mage/Catalog/Helper/Data.php +1 -1

app/code/core/Mage/Catalog/Helper/Flat/Abstract.php +101 -0

app/code/core/Mage/Catalog/Helper/Image.php +1 -1

app/code/core/Mage/Catalog/Helper/Map.php +1 -1

app/code/core/Mage/Catalog/Helper/Output.php +1 -1

app/code/core/Mage/Catalog/Helper/Product.php +1 -1

app/code/core/Mage/Catalog/Helper/Product/Compare.php +15 -13

app/code/core/Mage/Catalog/Helper/Product/Configuration.php +1 -1

app/code/core/Mage/Catalog/Helper/Product/Configuration/Interface.php +1 -1

app/code/core/Mage/Catalog/Helper/Product/Flat.php +55 -46

app/code/core/Mage/Catalog/Helper/Product/Options.php +1 -1

app/code/core/Mage/Catalog/Helper/Product/Url.php +1 -1

app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite.php +101 -0

app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite/Interface.php +55 -0

app/code/core/Mage/Catalog/Helper/Product/View.php +1 -1

app/code/core/Mage/Catalog/Model/Abstract.php +1 -1

app/code/core/Mage/Catalog/Model/Api/Resource.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Category.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Customer/V1.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Guest/V1.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Image.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Customer/V1.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Guest/V1.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php +5 -6

app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Admin/V1.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Customer/V1.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Guest/V1.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Website.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest/Admin/V1.php +1 -1

app/code/core/Mage/Catalog/Model/Api2/Product/Website/Validator/Admin/Website.php +1 -1

app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php +1 -1

app/code/core/Mage/Catalog/Model/Attribute/Backend/Urlkey/Abstract.php +74 -0

app/code/core/Mage/Catalog/Model/Category.php +41 -33

app/code/core/Mage/Catalog/Model/Category/Api.php +1 -1

app/code/core/Mage/Catalog/Model/Category/Api/V2.php +1 -1

app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php +1 -1

app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php +1 -1

app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php +1 -1

app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php +10 -9

app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php +3 -44

app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php +1 -1

app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php +1 -1

app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php +1 -1

app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php +1 -1

app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php +17 -3

app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php +1 -1

app/code/core/Mage/Catalog/Model/Category/Url.php +158 -0

app/code/core/Mage/Catalog/Model/Config.php +1 -1

app/code/core/Mage/Catalog/Model/Convert.php +1 -1

app/code/core/Mage/Catalog/Model/Convert/Adapter/Catalog.php +1 -1

app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php +2 -2

app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php +1 -1

app/code/core/Mage/Catalog/Model/Design.php +3 -2

app/code/core/Mage/Catalog/Model/Entity/Attribute.php +1 -1

app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php +1 -1

app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php +1 -1

app/code/core/Mage/Catalog/Model/Factory.php +104 -0

app/code/core/Mage/Catalog/Model/Index.php +1 -1

app/code/core/Mage/Catalog/Model/Indexer/Url.php +1 -1

app/code/core/Mage/Catalog/Model/Layer.php +1 -1

app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php +1 -1

app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php +1 -1

app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php +2 -2

app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php +1 -1

app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php +1 -1

app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php +1 -1

app/code/core/Mage/Catalog/Model/Layer/Filter/Price/Algorithm.php +1 -1

app/code/core/Mage/Catalog/Model/Layer/State.php +1 -1

app/code/core/Mage/Catalog/Model/Observer.php +64 -70

app/code/core/Mage/Catalog/Model/Product.php +11 -7

app/code/core/Mage/Catalog/Model/Product/Action.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Api.php +17 -4

app/code/core/Mage/Catalog/Model/Product/Api/V2.php +44 -23

app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php +2 -2

app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Boolean.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice/Abstract.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php +7 -3

app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Msrp.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Recurring.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php +57 -4

app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php +3 -32

app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Group.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Boolean.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Inputtype.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Enabled.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Price.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Compare/Item.php +7 -1

app/code/core/Mage/Catalog/Model/Product/Compare/List.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Condition.php +9 -2

app/code/core/Mage/Catalog/Model/Product/Condition/Interface.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Interface.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option/Interface.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php +58 -6

app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php +11 -11

app/code/core/Mage/Catalog/Model/Product/Image.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php +17 -3

app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Link.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Link/Api.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Media/Config.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Option.php +107 -4

app/code/core/Mage/Catalog/Model/Product/Option/Api.php +18 -14

app/code/core/Mage/Catalog/Model/Product/Option/Api/V2.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Option/Observer.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php +3 -3

app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php +5 -4

app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php +2 -2

app/code/core/Mage/Catalog/Model/Product/Option/Value.php +2 -2

app/code/core/Mage/Catalog/Model/Product/Option/Value/Api.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Option/Value/Api/V2.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Status.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Type.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php +2 -7

app/code/core/Mage/Catalog/Model/Product/Type/Api.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php +6 -8

app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Type/Grouped/Price.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Type/Price.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Type/Simple.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Url.php +124 -56

app/code/core/Mage/Catalog/Model/Product/Visibility.php +1 -1

app/code/core/Mage/Catalog/Model/Product/Website.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Abstract.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Attribute.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Category.php +72 -18

app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Layout.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Mode.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Page.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php +72 -12

app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php +104 -48

app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php +35 -11

app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Config.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Price.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Action.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Abstract.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Abstract.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Configurable.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Interface.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Relation.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Helper/Mysql4.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Attribute.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Decimal.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php +7 -3

app/code/core/Mage/Catalog/Model/Resource/Product.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Action.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/Abstract.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php +2 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Image.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Tierprice.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php +53 -24

app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php +37 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php +3 -6

app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Abstract.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Abstract.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Configurable.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Grouped.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Interface.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Link.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Link/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php +2 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Option.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Option/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Relation.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Status.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Product/Collection.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Product/Website.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Setup.php +1 -1

app/code/core/Mage/Catalog/Model/Resource/Url.php +1 -1

app/code/core/Mage/Catalog/Model/Session.php +1 -1

app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Category/Flat.php +3 -2

app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Product/Flat.php +1 -1

app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php +1 -1

app/code/core/Mage/Catalog/Model/Template/Filter.php +1 -1

app/code/core/Mage/Catalog/Model/Url.php +1 -1

app/code/core/Mage/Catalog/controllers/CategoryController.php +3 -1

app/code/core/Mage/Catalog/controllers/IndexController.php +1 -1

app/code/core/Mage/Catalog/controllers/Product/CompareController.php +1 -1

app/code/core/Mage/Catalog/controllers/ProductController.php +1 -1

app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php +1 -1

app/code/core/Mage/Catalog/data/catalog_setup/data-install-1.6.0.0.php +1 -1

app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.12-1.6.0.0.13.php +1 -1

app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php +2 -2

app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php +1 -1

app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.8-1.6.0.0.9.php +1 -1

app/code/core/Mage/Catalog/etc/adminhtml.xml +1 -1

app/code/core/Mage/Catalog/etc/api.xml +13 -1

app/code/core/Mage/Catalog/etc/api2.xml +1 -1

app/code/core/Mage/Catalog/etc/config.xml +35 -2

app/code/core/Mage/Catalog/etc/convert.xml +1 -1

app/code/core/Mage/Catalog/etc/system.xml +3 -2

app/code/core/Mage/Catalog/etc/widget.xml +34 -2

app/code/core/Mage/Catalog/etc/wsdl.xml +62 -22

app/code/core/Mage/Catalog/etc/wsi.xml +247 -2

app/code/core/Mage/Catalog/sql/catalog_setup/install-1.6.0.0.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.57-0.7.58.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.63-0.7.64.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.28-1.4.0.0.29.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.42-1.4.0.0.43.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.65-0.7.66.php +2 -2

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.69-0.7.70.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.70-0.7.71.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.71-0.7.72.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.72-0.7.73.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.73-1.4.0.0.0.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.11-1.4.0.0.12.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.13-1.4.0.0.14.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.14-1.4.0.0.15.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.15-1.4.0.0.16.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.16-1.4.0.0.17.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.17-1.4.0.0.18.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.18-1.4.0.0.19.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.19-1.4.0.0.20.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.20-1.4.0.0.21.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.21-1.4.0.0.22.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.22-1.4.0.0.23.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.23-1.4.0.0.24.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.24-1.4.0.0.25.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.25-1.4.0.0.26.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.26-1.4.0.0.27.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.27-1.4.0.0.28.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.28-1.4.0.0.29.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.30-1.4.0.0.31.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.31-1.4.0.0.32.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.32-1.4.0.0.33.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.33-1.4.0.0.34.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.34-1.4.0.0.35.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.35-1.4.0.0.36.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.36-1.4.0.0.37.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.37-1.4.0.0.38.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.38-1.4.0.0.39.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.39-1.4.0.0.40.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.40-1.4.0.0.41.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.41-1.4.0.0.42.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.43-1.4.0.0.44.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.6.0.0.8-1.6.0.0.9.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.10-1.6.0.0.11.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.11-1.6.0.0.12.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.php +37 -0

app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.15-1.6.0.0.18.php +29 -0

app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.3-1.6.0.0.4.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.4-1.6.0.0.5.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.5-1.6.0.0.6.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.6-1.6.0.0.7.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.7-1.6.0.0.8.php +1 -1

app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.9-1.6.0.0.10.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Aggregation.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Attribute.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Data/Simple.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Indexer.php +21 -10

app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Observer.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Price.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Resource/Abstract.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Resource/Aggregation.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Resource/Attribute.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Resource/Data/Abstract.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Resource/Data/Configurable.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Resource/Data/Grouped.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Abstract.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Eav.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Minimalprice.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Price.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Resource/Price.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Resource/Retreiver.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Resource/Setup.php +1 -1

app/code/core/Mage/CatalogIndex/Model/Retreiver.php +1 -1

app/code/core/Mage/CatalogIndex/etc/config.xml +1 -1

app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/install-1.6.0.0.php +1 -1

app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php +1 -1

app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php +1 -1

app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php +1 -1

app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php +1 -1

app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php +1 -1

app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php +1 -1

app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php +1 -1

app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php +1 -1

app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php +1 -1

app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php +1 -1

app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php +1 -1

app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1

app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php +1 -1

app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php +1 -1

app/code/core/Mage/CatalogInventory/Block/Qtyincrements.php +11 -1

app/code/core/Mage/CatalogInventory/Block/Stockqty/Abstract.php +1 -1

app/code/core/Mage/CatalogInventory/Block/Stockqty/Composite.php +1 -1

app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php +11 -1

app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Configurable.php +1 -1

app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Grouped.php +1 -1

app/code/core/Mage/CatalogInventory/Helper/Data.php +16 -1

app/code/core/Mage/CatalogInventory/Helper/Minsaleqty.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest/Admin/V1.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Validator/Item.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Configurable.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Interface.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Observer.php +44 -7

app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Configurable.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Default.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Grouped.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Interface.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php +60 -7

app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item/Collection.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Source/Stock.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Stock.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Stock/Item.php +3 -3

app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php +1 -1

app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php +35 -34

app/code/core/Mage/CatalogInventory/Model/Stock/Status.php +5 -3

app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minqty.php +1 -1

app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minsaleqty.php +1 -1

app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php +1 -1

app/code/core/Mage/CatalogInventory/etc/adminhtml.xml +1 -1

app/code/core/Mage/CatalogInventory/etc/api.xml +9 -1

app/code/core/Mage/CatalogInventory/etc/api2.xml +1 -1

app/code/core/Mage/CatalogInventory/etc/config.xml +10 -1

app/code/core/Mage/CatalogInventory/etc/system.xml +13 -3

app/code/core/Mage/CatalogInventory/etc/wsdl.xml +31 -0

app/code/core/Mage/CatalogInventory/etc/wsi.xml +41 -0

app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/install-1.6.0.0.php +1 -1

app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php +1 -1

app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php +1 -1

app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php +1 -1

app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php +1 -1

app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php +1 -1

app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php +1 -1

app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.5-0.7.6.php +1 -1

app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.6-0.7.7.php +1 -1

app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.7-0.7.8.php +1 -1

app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1

app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php +1 -1

app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php +1 -1

app/code/core/Mage/CatalogRule/Helper/Data.php +1 -1

app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh.php +648 -0

app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php +101 -0

app/code/core/Mage/CatalogRule/Model/Flag.php +1 -1

app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php +1 -1

app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php +1 -1

app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php +1 -1

app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php +1 -1

app/code/core/Mage/CatalogRule/Model/Observer.php +21 -13

app/code/core/Mage/CatalogRule/Model/Resource/Rule.php +258 -246

app/code/core/Mage/CatalogRule/Model/Resource/Rule/Collection.php +1 -1

app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price.php +1 -1

app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price/Collection.php +1 -1

app/code/core/Mage/CatalogRule/Model/Rule.php +89 -23

app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php +1 -1

app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php +1 -1

app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php +1 -1

app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php +103 -1

app/code/core/Mage/CatalogRule/Model/Rule/Product/Price.php +1 -1

app/code/core/Mage/CatalogRule/etc/adminhtml.xml +1 -1

app/code/core/Mage/CatalogRule/etc/config.xml +6 -3

app/code/core/Mage/CatalogRule/sql/catalogrule_setup/install-1.6.0.0.php +1 -1

app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php +1 -1

app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php +1 -1

app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php +1 -1

app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php +1 -1

app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php +1 -1

app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php +1 -1

app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php +1 -1

app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php +1 -1

app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.7-0.7.8.php +1 -1

app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.8-0.7.9.php +1 -1

app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.9-0.7.10.php +1 -1

app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1

app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.0-1.6.0.1.php +1 -1

app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.1-1.6.0.2.php +1 -1

app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.2-1.6.0.3.php +1 -1

app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php +19 -14

app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php +1 -1

app/code/core/Mage/CatalogSearch/Block/Autocomplete.php +3 -3

app/code/core/Mage/CatalogSearch/Block/Layer.php +2 -2

app/code/core/Mage/CatalogSearch/Block/Layer/Filter/Attribute.php +1 -1

app/code/core/Mage/CatalogSearch/Block/Result.php +1 -1

app/code/core/Mage/CatalogSearch/Block/Term.php +1 -1

app/code/core/Mage/CatalogSearch/Helper/Data.php +1 -1

Developer	Magento Core Team
Extension	Mage_Core_Modules
Version	1.8.0.0
Comparing to
See all releases


1	+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2	+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3	+ ] NOTE: Current Release Notes are maintained at: [
4	+ ] [
5	+ ] http://www.magentocommerce.com/knowledge-base/entry/ce-18-later-release-notes [
6	+ ] [
7	+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
8	+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9	+
10	==== 1.7.0.2 ====
11
12	=== Fixes ===

	@@ -168,9 +168,9 @@ final class Mage
168	{
169	return array(
170	'major' => '1',
171	- 'minor' => '7',
172	'revision' => '0',
173	- 'patch' => '2',
174	'stability' => '',
175	'number' => '',
176	);
	@@ -695,7 +695,7 @@ final class Mage
695	}
696	try {
697	self::dispatchEvent('mage_run_exception', array('exception' => $e));
698	- if (!headers_sent()) {
699	header('Location:' . self::getUrl('install'));
700	} else {
701	self::printException($e);


168	{
169	return array(
170	'major' => '1',
171	+ 'minor' => '8',
172	'revision' => '0',
173	+ 'patch' => '0',
174	'stability' => '',
175	'number' => '',
176	);

695	}
696	try {
697	self::dispatchEvent('mage_run_exception', array('exception' => $e));
698	+ if (!headers_sent() && self::isInstalled()) {
699	header('Location:' . self::getUrl('install'));
700	} else {
701	self::printException($e);

Mage_Core_Modules - Version 1.8.0.0

Version Notes

Release Info

Code changes from version 1.7.0.2 to 1.8.0.0

	@@ -31,8 +31,7 @@
31	############################################
32	## adjust memory limit
33
34	- # php_value memory_limit ~~64M~~
35	- php_value memory_limit 128M
36	php_value max_execution_time 18000
37
38	############################################


31	############################################
32	## adjust memory limit
33
34	+ php_value memory_limit 512M

35	php_value max_execution_time 18000
36
37	############################################

@@ -1,3 +1,12 @@
             ==== 1.7.0.2 ====
             === Fixes ===

	@@ -20,7 +20,7 @@
20	*
21	* @category Mage
22	* @package Mage_Admin
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25	*/
26


20	*
21	* @category Mage
22	* @package Mage_Admin
23	+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25	*/
26

	@@ -20,11 +20,10 @@
20	*
21	* @category Mage
22	* @package Mage_Admin
23	- * @copyright Copyright (c) ~~2012~~ Magento Inc. (http://www.magentocommerce.com)
24	* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25	*/
26
27	-
28	/**
29	* ACL user resource
30	*
	@@ -151,7 +150,7 @@ class Mage_Admin_Model_Resource_User extends Mage_Core_Model_Resource_Db_Abstrac
151	*/
152	private function _encryptPassword($pwStr)
153	{
154	- return Mage::helper('core')->getHash($pwStr, 2);
155	}
156
157	/**
	@@ -219,7 +218,7 @@ class Mage_Admin_Model_Resource_User extends Mage_Core_Model_Resource_Db_Abstrac
219	} catch (Mage_Core_Exception $e) {
220	throw $e;
221	return false;
222	- } catch (Exception $e){
223	$adapter->rollBack();
224	return false;
225	}
	@@ -238,7 +237,7 @@ class Mage_Admin_Model_Resource_User extends Mage_Core_Model_Resource_Db_Abstrac
238	{
239	$rolesIds = $user->getRoleIds();
240
241	- if( !is_array($rolesIds) \|\| count($rolesIds) == 0 ) {
242	return $user;
243	}
244
	@@ -275,7 +274,7 @@ class Mage_Admin_Model_Resource_User extends Mage_Core_Model_Resource_Db_Abstrac
275	$adapter->commit();
276	} catch (Mage_Core_Exception $e) {
277	throw $e;
278	- } catch (Exception $e){
279	$adapter->rollBack();
280	throw $e;
281	}
	@@ -331,7 +330,7 @@ class Mage_Admin_Model_Resource_User extends Mage_Core_Model_Resource_Db_Abstrac
331
332	$aRoles = $this->hasAssigned2Role($user);
333	if ( sizeof($aRoles) > 0 ) {
334	- foreach($aRoles as $idx => $data){
335	$conditions = array(
336	'role_id = ?' => $data['role_id'],
337	);