Mage_Core_Modules - Version 1.7.0.0

Version Notes

1.7.0.0

Download this release

Release Info

Developer Magento Core Team
Extension Mage_Core_Modules
Version 1.7.0.0
Comparing to
See all releases


Code changes from version 1.6.2.0 to 1.7.0.0

Files changed (434) hide show
  1. RELEASE_NOTES.txt +2037 -0
  2. api.php +88 -0
  3. app/Mage.php +91 -14
  4. app/code/core/Mage/Admin/Helper/Data.php +1 -1
  5. app/code/core/Mage/Admin/Model/Acl.php +1 -1
  6. app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php +1 -1
  7. app/code/core/Mage/Admin/Model/Acl/Assert/Time.php +1 -1
  8. app/code/core/Mage/Admin/Model/Acl/Resource.php +1 -1
  9. app/code/core/Mage/Admin/Model/Acl/Role.php +1 -1
  10. app/code/core/Mage/Admin/Model/Acl/Role/Generic.php +1 -1
  11. app/code/core/Mage/Admin/Model/Acl/Role/Group.php +1 -1
  12. app/code/core/Mage/Admin/Model/Acl/Role/Registry.php +1 -1
  13. app/code/core/Mage/Admin/Model/Acl/Role/User.php +1 -1
  14. app/code/core/Mage/Admin/Model/Config.php +4 -1
  15. app/code/core/Mage/Admin/Model/Mysql4/Acl.php +1 -1
  16. app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php +1 -1
  17. app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php +1 -1
  18. app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php +1 -1
  19. app/code/core/Mage/Admin/Model/Mysql4/Role.php +1 -1
  20. app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php +1 -1
  21. app/code/core/Mage/Admin/Model/Mysql4/Roles.php +1 -1
  22. app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php +1 -1
  23. app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php +1 -1
  24. app/code/core/Mage/Admin/Model/Mysql4/Rules.php +1 -1
  25. app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php +1 -1
  26. app/code/core/Mage/Admin/Model/Mysql4/User.php +1 -1
  27. app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php +1 -1
  28. app/code/core/Mage/Admin/Model/Observer.php +5 -3
  29. app/code/core/Mage/Admin/Model/Resource/Acl.php +1 -1
  30. app/code/core/Mage/Admin/Model/Resource/Acl/Role.php +1 -1
  31. app/code/core/Mage/Admin/Model/Resource/Acl/Role/Collection.php +1 -1
  32. app/code/core/Mage/Admin/Model/Resource/Permissions/Collection.php +1 -1
  33. app/code/core/Mage/Admin/Model/Resource/Role.php +1 -1
  34. app/code/core/Mage/Admin/Model/Resource/Role/Collection.php +1 -1
  35. app/code/core/Mage/Admin/Model/Resource/Roles.php +1 -1
  36. app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php +1 -1
  37. app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php +1 -1
  38. app/code/core/Mage/Admin/Model/Resource/Rules.php +1 -1
  39. app/code/core/Mage/Admin/Model/Resource/Rules/Collection.php +1 -1
  40. app/code/core/Mage/Admin/Model/Resource/User.php +1 -1
  41. app/code/core/Mage/Admin/Model/Resource/User/Collection.php +1 -1
  42. app/code/core/Mage/Admin/Model/Role.php +1 -1
  43. app/code/core/Mage/Admin/Model/Roles.php +52 -10
  44. app/code/core/Mage/Admin/Model/Rules.php +1 -1
  45. app/code/core/Mage/Admin/Model/Session.php +9 -9
  46. app/code/core/Mage/Admin/Model/User.php +8 -4
  47. app/code/core/Mage/Admin/data/admin_setup/data-install-1.6.0.0.php +1 -1
  48. app/code/core/Mage/Admin/etc/config.xml +1 -1
  49. app/code/core/Mage/Admin/sql/admin_setup/install-1.6.0.0.php +7 -7
  50. app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php +1 -1
  51. app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php +1 -1
  52. app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.1-0.7.2.php +1 -1
  53. app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1
  54. app/code/core/Mage/Admin/sql/admin_setup/{mysql4-upgrade-1.6.0.0-1.6.1.0.php → upgrade-1.6.0.0-1.6.1.0.php} +1 -1
  55. app/code/core/Mage/AdminNotification/Helper/Data.php +3 -1
  56. app/code/core/Mage/AdminNotification/Model/Feed.php +1 -1
  57. app/code/core/Mage/AdminNotification/Model/Inbox.php +91 -1
  58. app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php +1 -1
  59. app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php +1 -1
  60. app/code/core/Mage/AdminNotification/Model/Observer.php +1 -1
  61. app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php +8 -2
  62. app/code/core/Mage/AdminNotification/Model/Resource/Inbox/Collection.php +1 -1
  63. app/code/core/Mage/AdminNotification/Model/Survey.php +3 -1
  64. app/code/core/Mage/AdminNotification/etc/adminhtml.xml +1 -1
  65. app/code/core/Mage/AdminNotification/etc/config.xml +1 -1
  66. app/code/core/Mage/AdminNotification/etc/system.xml +1 -1
  67. app/code/core/Mage/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php +1 -1
  68. app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php +1 -1
  69. app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1
  70. app/code/core/Mage/Api/Controller/Action.php +1 -1
  71. app/code/core/Mage/Api/Exception.php +1 -1
  72. app/code/core/Mage/Api/Helper/Data.php +16 -2
  73. app/code/core/Mage/Api/Model/Acl.php +1 -1
  74. app/code/core/Mage/Api/Model/Acl/Assert/Ip.php +1 -1
  75. app/code/core/Mage/Api/Model/Acl/Assert/Time.php +1 -1
  76. app/code/core/Mage/Api/Model/Acl/Resource.php +1 -1
  77. app/code/core/Mage/Api/Model/Acl/Role.php +1 -1
  78. app/code/core/Mage/Api/Model/Acl/Role/Generic.php +1 -1
  79. app/code/core/Mage/Api/Model/Acl/Role/Group.php +1 -1
  80. app/code/core/Mage/Api/Model/Acl/Role/Registry.php +1 -1
  81. app/code/core/Mage/Api/Model/Acl/Role/User.php +1 -1
  82. app/code/core/Mage/Api/Model/Config.php +19 -1
  83. app/code/core/Mage/Api/Model/Mysql4/Acl.php +1 -1
  84. app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php +1 -1
  85. app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php +1 -1
  86. app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php +1 -1
  87. app/code/core/Mage/Api/Model/Mysql4/Role.php +1 -1
  88. app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php +1 -1
  89. app/code/core/Mage/Api/Model/Mysql4/Roles.php +1 -1
  90. app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php +1 -1
  91. app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php +1 -1
  92. app/code/core/Mage/Api/Model/Mysql4/Rules.php +1 -1
  93. app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php +1 -1
  94. app/code/core/Mage/Api/Model/Mysql4/User.php +1 -1
  95. app/code/core/Mage/Api/Model/Mysql4/User/Collection.php +1 -1
  96. app/code/core/Mage/Api/Model/Resource/Abstract.php +1 -1
  97. app/code/core/Mage/Api/Model/Resource/Acl.php +1 -1
  98. app/code/core/Mage/Api/Model/Resource/Acl/Role.php +1 -1
  99. app/code/core/Mage/Api/Model/Resource/Acl/Role/Collection.php +1 -1
  100. app/code/core/Mage/Api/Model/Resource/Permissions/Collection.php +1 -1
  101. app/code/core/Mage/Api/Model/Resource/Role.php +1 -1
  102. app/code/core/Mage/Api/Model/Resource/Role/Collection.php +1 -1
  103. app/code/core/Mage/Api/Model/Resource/Roles.php +1 -1
  104. app/code/core/Mage/Api/Model/Resource/Roles/Collection.php +1 -1
  105. app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php +1 -1
  106. app/code/core/Mage/Api/Model/Resource/Rules.php +1 -1
  107. app/code/core/Mage/Api/Model/Resource/Rules/Collection.php +1 -1
  108. app/code/core/Mage/Api/Model/Resource/User.php +1 -1
  109. app/code/core/Mage/Api/Model/Resource/User/Collection.php +1 -1
  110. app/code/core/Mage/Api/Model/Role.php +5 -2
  111. app/code/core/Mage/Api/Model/Roles.php +47 -4
  112. app/code/core/Mage/Api/Model/Rules.php +1 -1
  113. app/code/core/Mage/Api/Model/Server.php +68 -14
  114. app/code/core/Mage/Api/Model/Server/Adapter/Interface.php +1 -1
  115. app/code/core/Mage/Api/Model/Server/Adapter/Soap.php +38 -21
  116. app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php +14 -6
  117. app/code/core/Mage/Api/Model/Server/Handler.php +1 -1
  118. app/code/core/Mage/Api/Model/Server/Handler/Abstract.php +9 -5
  119. app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php +1 -1
  120. app/code/core/Mage/Api/Model/Server/V2/Handler.php +1 -1
  121. app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php +11 -15
  122. app/code/core/Mage/Api/Model/Server/Wsi/Handler.php +5 -8
  123. app/code/core/Mage/Api/Model/Session.php +4 -8
  124. app/code/core/Mage/Api/Model/User.php +8 -1
  125. app/code/core/Mage/Api/Model/Wsdl/Config.php +1 -1
  126. app/code/core/Mage/Api/Model/Wsdl/Config/Base.php +30 -10
  127. app/code/core/Mage/Api/Model/Wsdl/Config/Element.php +1 -1
  128. app/code/core/Mage/Api/controllers/IndexController.php +1 -1
  129. app/code/core/Mage/Api/controllers/SoapController.php +1 -1
  130. app/code/core/Mage/Api/controllers/V2/SoapController.php +1 -1
  131. app/code/core/Mage/Api/controllers/XmlrpcController.php +1 -1
  132. app/code/core/Mage/Api/etc/adminhtml.xml +7 -5
  133. app/code/core/Mage/Api/etc/api.xml +150 -1
  134. app/code/core/Mage/Api/etc/config.xml +2 -1
  135. app/code/core/Mage/Api/etc/system.xml +11 -1
  136. app/code/core/Mage/Api/etc/wsdl2.xml +20 -1
  137. app/code/core/Mage/Api/etc/wsi.xml +1 -1
  138. app/code/core/Mage/Api/sql/api_setup/install-1.6.0.0.php +1 -1
  139. app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php +1 -1
  140. app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php +1 -1
  141. app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php +1 -1
  142. app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1
  143. app/code/core/Mage/Api2/Block/Adminhtml/Attribute.php +48 -0
  144. app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php +112 -0
  145. app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit.php +61 -0
  146. app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit/Form.php +58 -0
  147. app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php +107 -0
  148. app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tab/Resource.php +141 -0
  149. app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tabs.php +47 -0
  150. app/code/core/Mage/Api2/Block/Adminhtml/Permissions/User/Edit/Tab/Roles.php +203 -0
  151. app/code/core/Mage/Api2/Block/Adminhtml/Roles.php +56 -0
  152. app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php +146 -0
  153. app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php +149 -0
  154. app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php +131 -0
  155. app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Resources.php +153 -0
  156. app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.php +239 -0
  157. app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tabs.php +65 -0
  158. app/code/core/Mage/Api2/Exception.php +50 -0
  159. app/code/core/Mage/Api2/Helper/Data.php +198 -0
  160. app/code/core/Mage/Api2/Model/Acl.php +187 -0
  161. app/code/core/Mage/Api2/Model/Acl/Filter.php +193 -0
  162. app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php +77 -0
  163. app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/Operation.php +67 -0
  164. app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php +181 -0
  165. app/code/core/Mage/Api2/Model/Acl/Global.php +65 -0
  166. app/code/core/Mage/Api2/Model/Acl/Global/Role.php +185 -0
  167. app/code/core/Mage/Api2/Model/Acl/Global/Rule.php +65 -0
  168. app/code/core/Mage/Api2/Model/Acl/Global/Rule/Permission.php +74 -0
  169. app/code/core/Mage/Api2/Model/Acl/Global/Rule/Privilege.php +77 -0
  170. app/code/core/Mage/Api2/Model/Acl/Global/Rule/ResourcePermission.php +122 -0
  171. app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php +546 -0
  172. app/code/core/Mage/Api2/Model/Acl/PermissionInterface.php +52 -0
  173. app/code/core/Mage/Api2/Model/Auth.php +80 -0
  174. app/code/core/Mage/Api2/Model/Auth/Adapter.php +93 -0
  175. app/code/core/Mage/Api2/Model/Auth/Adapter/Abstract.php +53 -0
  176. app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php +78 -0
  177. app/code/core/Mage/Api2/Model/Auth/User.php +61 -0
  178. app/code/core/Mage/Api2/Model/Auth/User/Abstract.php +96 -0
  179. app/code/core/Mage/Api2/Model/Auth/User/Admin.php +106 -0
  180. app/code/core/Mage/Api2/Model/Auth/User/Customer.php +80 -0
  181. app/code/core/Mage/Api2/Model/Auth/User/Guest.php +80 -0
  182. app/code/core/Mage/Api2/Model/Config.php +449 -0
  183. app/code/core/Mage/Api2/Model/Dispatcher.php +162 -0
  184. app/code/core/Mage/Api2/Model/Multicall.php +278 -0
  185. app/code/core/Mage/Api2/Model/Observer.php +86 -0
  186. app/code/core/Mage/Api2/Model/Renderer.php +83 -0
  187. app/code/core/Mage/Api2/Model/Renderer/Interface.php +50 -0
  188. app/code/core/Mage/Api2/Model/Renderer/Json.php +61 -0
  189. app/code/core/Mage/Api2/Model/Renderer/Query.php +62 -0
  190. app/code/core/Mage/Api2/Model/Renderer/Xml.php +162 -0
  191. app/code/core/Mage/Api2/Model/Renderer/Xml/Writer.php +80 -0
  192. app/code/core/Mage/Api2/Model/Request.php +325 -0
  193. app/code/core/Mage/Api2/Model/Request/Internal.php +105 -0
  194. app/code/core/Mage/Api2/Model/Request/Interpreter.php +76 -0
  195. app/code/core/Mage/Api2/Model/Request/Interpreter/Interface.php +43 -0
  196. app/code/core/Mage/Api2/Model/Request/Interpreter/Json.php +57 -0
  197. app/code/core/Mage/Api2/Model/Request/Interpreter/Query.php +77 -0
  198. app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.php +150 -0
  199. app/code/core/Mage/Api2/Model/Resource.php +1082 -0
  200. app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php +87 -0
  201. app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php +57 -0
  202. app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php +121 -0
  203. app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php +63 -0
  204. app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule.php +45 -0
  205. app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php +57 -0
  206. app/code/core/Mage/Api2/Model/Resource/Setup.php +36 -0
  207. app/code/core/Mage/Api2/Model/Resource/Validator.php +102 -0
  208. app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php +249 -0
  209. app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php +186 -0
  210. app/code/core/Mage/Api2/Model/Response.php +114 -0
  211. app/code/core/Mage/Api2/Model/Route/Abstract.php +99 -0
  212. app/code/core/Mage/Api2/Model/Route/ApiType.php +57 -0
  213. app/code/core/Mage/Api2/Model/Route/Interface.php +45 -0
  214. app/code/core/Mage/Api2/Model/Route/Rest.php +36 -0
  215. app/code/core/Mage/Api2/Model/Router.php +122 -0
  216. app/code/core/Mage/Api2/Model/Server.php +315 -0
  217. app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php +148 -0
  218. app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php +340 -0
  219. app/code/core/Mage/Api2/etc/adminhtml.xml +93 -0
  220. app/code/core/Mage/Api2/etc/config.xml +212 -0
  221. app/code/core/Mage/Api2/sql/api2_setup/install-1.0.0.0.php +183 -0
  222. app/code/core/Mage/Authorizenet/Block/Directpost/Form.php +1 -1
  223. app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php +1 -1
  224. app/code/core/Mage/Authorizenet/Helper/Data.php +1 -1
  225. app/code/core/Mage/Authorizenet/Model/Directpost.php +1 -1
  226. app/code/core/Mage/Authorizenet/Model/Directpost/Observer.php +1 -1
  227. app/code/core/Mage/Authorizenet/Model/Directpost/Request.php +1 -1
  228. app/code/core/Mage/Authorizenet/Model/Directpost/Response.php +1 -1
  229. app/code/core/Mage/Authorizenet/Model/Directpost/Session.php +1 -1
  230. app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php +1 -1
  231. app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php +1 -1
  232. app/code/core/Mage/Authorizenet/etc/config.xml +1 -1
  233. app/code/core/Mage/Authorizenet/etc/system.xml +3 -1
  234. app/code/core/Mage/Backup/Exception.php +1 -1
  235. app/code/core/Mage/Backup/Helper/Data.php +291 -1
  236. app/code/core/Mage/Backup/Model/Backup.php +72 -24
  237. app/code/core/Mage/Backup/Model/Config/Backend/Cron.php +89 -0
  238. app/code/core/Mage/Backup/Model/Config/Source/Type.php +52 -0
  239. app/code/core/Mage/Backup/Model/Db.php +33 -5
  240. app/code/core/Mage/Backup/Model/Fs/Collection.php +10 -2
  241. app/code/core/Mage/Backup/Model/Mysql4/Db.php +1 -1
  242. app/code/core/Mage/Backup/Model/Observer.php +95 -0
  243. app/code/core/Mage/Backup/Model/Resource/Db.php +31 -18
  244. app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php +43 -10
  245. app/code/core/Mage/Backup/etc/adminhtml.xml +6 -1
  246. app/code/core/Mage/Backup/etc/config.xml +10 -1
  247. app/code/core/Mage/Backup/etc/system.xml +95 -0
  248. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Bundle.php +1 -1
  249. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php +1 -1
  250. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php +1 -1
  251. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php +1 -1
  252. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php +1 -1
  253. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php +18 -5
  254. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php +1 -1
  255. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php +1 -1
  256. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php +1 -1
  257. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php +26 -2
  258. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php +1 -1
  259. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php +1 -1
  260. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php +1 -1
  261. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php +1 -1
  262. app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php +1 -1
  263. app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php +1 -1
  264. app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php +1 -1
  265. app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php +1 -1
  266. app/code/core/Mage/Bundle/Block/Catalog/Product/View.php +1 -1
  267. app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php +6 -3
  268. app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php +8 -3
  269. app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php +1 -1
  270. app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php +1 -1
  271. app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php +1 -1
  272. app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php +1 -1
  273. app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php +1 -1
  274. app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php +1 -1
  275. app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php +14 -7
  276. app/code/core/Mage/Bundle/Helper/Data.php +1 -1
  277. app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php +1 -1
  278. app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php +1 -1
  279. app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Price.php +1 -1
  280. app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php +1 -1
  281. app/code/core/Mage/Bundle/Model/Mysql4/Option.php +1 -1
  282. app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php +1 -1
  283. app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php +1 -1
  284. app/code/core/Mage/Bundle/Model/Mysql4/Selection.php +1 -1
  285. app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php +1 -1
  286. app/code/core/Mage/Bundle/Model/Observer.php +14 -1
  287. app/code/core/Mage/Bundle/Model/Option.php +1 -1
  288. app/code/core/Mage/Bundle/Model/Price/Index.php +1 -1
  289. app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php +1 -1
  290. app/code/core/Mage/Bundle/Model/Product/Price.php +140 -82
  291. app/code/core/Mage/Bundle/Model/Product/Type.php +9 -8
  292. app/code/core/Mage/Bundle/Model/Resource/Bundle.php +1 -1
  293. app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php +155 -22
  294. app/code/core/Mage/Bundle/Model/Resource/Indexer/Stock.php +1 -1
  295. app/code/core/Mage/Bundle/Model/Resource/Option.php +1 -1
  296. app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php +1 -1
  297. app/code/core/Mage/Bundle/Model/Resource/Price/Index.php +1 -1
  298. app/code/core/Mage/Bundle/Model/Resource/Selection.php +1 -1
  299. app/code/core/Mage/Bundle/Model/Resource/Selection/Collection.php +1 -1
  300. app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php +7 -4
  301. app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php +17 -14
  302. app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php +12 -11
  303. app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php +12 -9
  304. app/code/core/Mage/Bundle/Model/Selection.php +1 -1
  305. app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php +1 -1
  306. app/code/core/Mage/Bundle/Model/Source/Option/Type.php +1 -1
  307. app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php +1 -1
  308. app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php +1 -1
  309. app/code/core/Mage/Bundle/controllers/Product/EditController.php +1 -1
  310. app/code/core/Mage/Bundle/controllers/SelectionController.php +1 -1
  311. app/code/core/Mage/Bundle/data/bundle_setup/data-install-1.6.0.0.php +1 -1
  312. app/code/core/Mage/Bundle/etc/config.xml +10 -2
  313. app/code/core/Mage/Bundle/sql/bundle_setup/install-1.6.0.0.php +1 -1
  314. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-data-upgrade-0.1.13-0.1.14.php +1 -1
  315. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php +1 -1
  316. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php +1 -1
  317. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php +1 -1
  318. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.10-0.1.11.php +1 -1
  319. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.11-0.1.12.php +1 -1
  320. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.12-0.1.13.php +1 -1
  321. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php +1 -1
  322. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php +1 -1
  323. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php +1 -1
  324. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php +1 -1
  325. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php +1 -1
  326. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.7-0.1.8.php +1 -1
  327. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.8-0.1.9.php +1 -1
  328. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.9-0.1.10.php +1 -1
  329. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1
  330. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php +44 -0
  331. app/code/core/Mage/Bundle/sql/bundle_setup/upgrade-1.6.0.0-1.6.0.0.1.php +84 -0
  332. app/code/core/Mage/Captcha/Block/Captcha.php +48 -0
  333. app/code/core/Mage/Captcha/Block/Captcha/Zend.php +89 -0
  334. app/code/core/Mage/Captcha/Helper/Data.php +138 -0
  335. app/code/core/Mage/Captcha/Model/Config/Font.php +49 -0
  336. app/code/core/Mage/Captcha/Model/Config/Form/Abstract.php +61 -0
  337. app/code/core/Mage/Captcha/Model/Config/Form/Backend.php +40 -0
  338. app/code/core/Mage/Captcha/Model/Config/Form/Frontend.php +40 -0
  339. app/code/core/Mage/Captcha/Model/Config/Mode.php +54 -0
  340. app/code/core/Mage/Captcha/Model/Interface.php +60 -0
  341. app/code/core/Mage/Captcha/Model/Observer.php +292 -0
  342. app/code/core/Mage/Captcha/Model/Resource/Log.php +158 -0
  343. app/code/core/Mage/Captcha/Model/Zend.php +504 -0
  344. app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php +50 -0
  345. app/code/core/Mage/Captcha/controllers/RefreshController.php +50 -0
  346. app/code/core/Mage/Captcha/etc/config.xml +271 -0
  347. app/code/core/Mage/Captcha/etc/system.xml +250 -0
  348. app/code/core/Mage/Captcha/sql/captcha_setup/install-1.7.0.0.0.php +51 -0
  349. app/code/core/Mage/Catalog/Block/Breadcrumbs.php +1 -1
  350. app/code/core/Mage/Catalog/Block/Category/View.php +1 -1
  351. app/code/core/Mage/Catalog/Block/Category/Widget/Link.php +1 -1
  352. app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php +19 -1
  353. app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php +1 -1
  354. app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php +1 -1
  355. app/code/core/Mage/Catalog/Block/Layer/Filter/Decimal.php +1 -1
  356. app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php +1 -1
  357. app/code/core/Mage/Catalog/Block/Layer/State.php +1 -1
  358. app/code/core/Mage/Catalog/Block/Layer/View.php +11 -1
  359. app/code/core/Mage/Catalog/Block/Navigation.php +1 -1
  360. app/code/core/Mage/Catalog/Block/Product.php +1 -1
  361. app/code/core/Mage/Catalog/Block/Product/Abstract.php +18 -9
  362. app/code/core/Mage/Catalog/Block/Product/Compare/Abstract.php +1 -1
  363. app/code/core/Mage/Catalog/Block/Product/Compare/List.php +1 -1
  364. app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php +1 -1
  365. app/code/core/Mage/Catalog/Block/Product/Gallery.php +1 -1
  366. app/code/core/Mage/Catalog/Block/Product/List.php +1 -1
  367. app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php +2 -2
  368. app/code/core/Mage/Catalog/Block/Product/List/Promotion.php +1 -1
  369. app/code/core/Mage/Catalog/Block/Product/List/Random.php +1 -1
  370. app/code/core/Mage/Catalog/Block/Product/List/Related.php +2 -2
  371. app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php +1 -1
  372. app/code/core/Mage/Catalog/Block/Product/List/Upsell.php +2 -2
  373. app/code/core/Mage/Catalog/Block/Product/New.php +11 -4
  374. app/code/core/Mage/Catalog/Block/Product/Price.php +17 -7
  375. app/code/core/Mage/Catalog/Block/Product/Price/Template.php +1 -1
  376. app/code/core/Mage/Catalog/Block/Product/Send.php +1 -1
  377. app/code/core/Mage/Catalog/Block/Product/View.php +28 -16
  378. app/code/core/Mage/Catalog/Block/Product/View/Abstract.php +1 -1
  379. app/code/core/Mage/Catalog/Block/Product/View/Additional.php +1 -1
  380. app/code/core/Mage/Catalog/Block/Product/View/Attributes.php +1 -1
  381. app/code/core/Mage/Catalog/Block/Product/View/Description.php +1 -1
  382. app/code/core/Mage/Catalog/Block/Product/View/Media.php +24 -6
  383. app/code/core/Mage/Catalog/Block/Product/View/Options.php +27 -3
  384. app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php +3 -3
  385. app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php +1 -1
  386. app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php +1 -1
  387. app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php +1 -1
  388. app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php +22 -13
  389. app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php +1 -1
  390. app/code/core/Mage/Catalog/Block/Product/View/Price.php +1 -1
  391. app/code/core/Mage/Catalog/Block/Product/View/Tabs.php +1 -1
  392. app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php +72 -42
  393. app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php +1 -1
  394. app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php +1 -1
  395. app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php +1 -1
  396. app/code/core/Mage/Catalog/Block/Product/Widget/Link.php +1 -1
  397. app/code/core/Mage/Catalog/Block/Product/Widget/New.php +1 -1
  398. app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php +1 -1
  399. app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php +1 -1
  400. app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php +1 -1
  401. app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php +1 -1
  402. app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php +1 -1
  403. app/code/core/Mage/Catalog/Block/Widget/Link.php +1 -1
  404. app/code/core/Mage/Catalog/Exception.php +1 -1
  405. app/code/core/Mage/Catalog/Helper/Category.php +1 -1
  406. app/code/core/Mage/Catalog/Helper/Category/Flat.php +1 -1
  407. app/code/core/Mage/Catalog/Helper/Data.php +12 -1
  408. app/code/core/Mage/Catalog/Helper/Image.php +171 -30
  409. app/code/core/Mage/Catalog/Helper/Map.php +1 -1
  410. app/code/core/Mage/Catalog/Helper/Output.php +1 -1
  411. app/code/core/Mage/Catalog/Helper/Product.php +47 -20
  412. app/code/core/Mage/Catalog/Helper/Product/Compare.php +1 -1
  413. app/code/core/Mage/Catalog/Helper/Product/Configuration.php +1 -1
  414. app/code/core/Mage/Catalog/Helper/Product/Configuration/Interface.php +1 -1
  415. app/code/core/Mage/Catalog/Helper/Product/Flat.php +1 -1
  416. app/code/core/Mage/Catalog/Helper/Product/Options.php +1 -1
  417. app/code/core/Mage/Catalog/Helper/Product/Url.php +1 -1
  418. app/code/core/Mage/Catalog/Helper/Product/View.php +1 -1
  419. app/code/core/Mage/Catalog/Model/Abstract.php +1 -1
  420. app/code/core/Mage/Catalog/Model/Api/Resource.php +1 -1
  421. app/code/core/Mage/Catalog/Model/Api2/Product.php +94 -0
  422. app/code/core/Mage/Catalog/Model/Api2/Product/Category.php +36 -0
  423. app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest.php +105 -0
  424. app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.php +146 -0
  425. app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Customer/V1.php +36 -0
  426. app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Guest/V1.php +36 -0
  427. app/code/core/Mage/Catalog/Model/Api2/Product/Image.php +36 -0
  428. app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest.php +222 -0
  429. app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php +237 -0
  430. app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Customer/V1.php +36 -0
  431. app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Guest/V1.php +36 -0
  432. app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php +53 -0
  433. app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php +402 -0
  434. app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Admin/V1.php +42 -0
RELEASE_NOTES.txt CHANGED
@@ -1,3 +1,1414 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  ==== 1.6.2.0 ====
2
 
3
  === Improvements ===
@@ -30,6 +1441,632 @@ Fixed Exception while products mass update attributes in backend
30
 
31
 
32