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 (4058) 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 +391 -0
  435. app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Customer/V1.php +90 -0
  436. app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Guest/V1.php +57 -0
  437. app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php +610 -0
  438. app/code/core/Mage/Catalog/Model/Api2/Product/Website.php +69 -0
  439. app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest.php +258 -0
  440. app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest/Admin/V1.php +36 -0
  441. app/code/core/Mage/Catalog/Model/Api2/Product/Website/Validator/Admin/Website.php +177 -0
  442. app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php +1 -1
  443. app/code/core/Mage/Catalog/Model/Category.php +6 -6
  444. app/code/core/Mage/Catalog/Model/Category/Api.php +9 -4
  445. app/code/core/Mage/Catalog/Model/Category/Api/V2.php +6 -4
  446. app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php +1 -1
  447. app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php +1 -1
  448. app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php +1 -1
  449. app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php +1 -1
  450. app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php +1 -1
  451. app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php +1 -1
  452. app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php +1 -1
  453. app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php +1 -1
  454. app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php +1 -1
  455. app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php +1 -1
  456. app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php +1 -1
  457. app/code/core/Mage/Catalog/Model/Config.php +1 -1
  458. app/code/core/Mage/Catalog/Model/Convert.php +1 -1
  459. app/code/core/Mage/Catalog/Model/Convert/Adapter/Catalog.php +1 -1
  460. app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php +7 -27
  461. app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php +1 -1
  462. app/code/core/Mage/Catalog/Model/Design.php +1 -1
  463. app/code/core/Mage/Catalog/Model/Entity/Attribute.php +1 -1
  464. app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php +1 -1
  465. app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php +1 -1
  466. app/code/core/Mage/Catalog/Model/Index.php +1 -1
  467. app/code/core/Mage/Catalog/Model/Indexer/Url.php +2 -1
  468. app/code/core/Mage/Catalog/Model/Layer.php +1 -2
  469. app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php +11 -1
  470. app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php +3 -4
  471. app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php +1 -1
  472. app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php +1 -1
  473. app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php +22 -1
  474. app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php +317 -30
  475. app/code/core/Mage/Catalog/Model/Layer/Filter/Price/Algorithm.php +610 -0
  476. app/code/core/Mage/Catalog/Model/Layer/State.php +1 -1
  477. app/code/core/Mage/Catalog/Model/Observer.php +68 -1
  478. app/code/core/Mage/Catalog/Model/Product.php +174 -40
  479. app/code/core/Mage/Catalog/Model/Product/Action.php +1 -1
  480. app/code/core/Mage/Catalog/Model/Product/Api.php +19 -3
  481. app/code/core/Mage/Catalog/Model/Product/Api/V2.php +29 -8
  482. app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php +1 -1
  483. app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php +1 -1
  484. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Boolean.php +1 -1
  485. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice.php +57 -0
  486. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice/Abstract.php +369 -0
  487. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php +6 -1
  488. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Msrp.php +1 -1
  489. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php +1 -1
  490. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Recurring.php +1 -1
  491. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.php +1 -1
  492. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php +1 -1
  493. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php +20 -259
  494. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php +1 -1
  495. app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php +1 -1
  496. app/code/core/Mage/Catalog/Model/Product/Attribute/Group.php +1 -1
  497. app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php +11 -1
  498. app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php +1 -1
  499. app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php +1 -1
  500. app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php +1 -1
  501. app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Boolean.php +1 -1
  502. app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php +4 -6
  503. app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Inputtype.php +1 -1
  504. app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php +1 -1
  505. app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type.php +1 -1
  506. app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Enabled.php +1 -1
  507. app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Price.php +1 -1
  508. app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php +2 -3
  509. app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php +1 -1
  510. app/code/core/Mage/Catalog/Model/Product/Compare/Item.php +1 -1
  511. app/code/core/Mage/Catalog/Model/Product/Compare/List.php +1 -1
  512. app/code/core/Mage/Catalog/Model/Product/Condition.php +1 -1
  513. app/code/core/Mage/Catalog/Model/Product/Condition/Interface.php +1 -1
  514. app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Interface.php +1 -1
  515. app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option.php +1 -1
  516. app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option/Interface.php +1 -1
  517. app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php +1 -1
  518. app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php +1 -1
  519. app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php +1 -1
  520. app/code/core/Mage/Catalog/Model/Product/Image.php +1 -1
  521. app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php +1 -1
  522. app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php +2 -2
  523. app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php +1 -1
  524. app/code/core/Mage/Catalog/Model/Product/Link.php +1 -1
  525. app/code/core/Mage/Catalog/Model/Product/Link/Api.php +1 -1
  526. app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php +1 -1
  527. app/code/core/Mage/Catalog/Model/Product/Media/Config.php +1 -1
  528. app/code/core/Mage/Catalog/Model/Product/Option.php +13 -5
  529. app/code/core/Mage/Catalog/Model/Product/Option/Api.php +1 -1
  530. app/code/core/Mage/Catalog/Model/Product/Option/Api/V2.php +1 -1
  531. app/code/core/Mage/Catalog/Model/Product/Option/Observer.php +1 -1
  532. app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php +7 -5
  533. app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php +1 -1
  534. app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php +8 -10
  535. app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php +1 -1
  536. app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php +1 -1
  537. app/code/core/Mage/Catalog/Model/Product/Option/Value.php +1 -1
  538. app/code/core/Mage/Catalog/Model/Product/Option/Value/Api.php +2 -2
  539. app/code/core/Mage/Catalog/Model/Product/Option/Value/Api/V2.php +1 -1
  540. app/code/core/Mage/Catalog/Model/Product/Status.php +2 -2
  541. app/code/core/Mage/Catalog/Model/Product/Type.php +1 -1
  542. app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php +1 -1
  543. app/code/core/Mage/Catalog/Model/Product/Type/Api.php +1 -1
  544. app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php +1 -1
  545. app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php +22 -17
  546. app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php +1 -1
  547. app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php +33 -11
  548. app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php +1 -1
  549. app/code/core/Mage/Catalog/Model/Product/Type/Grouped/Price.php +1 -1
  550. app/code/core/Mage/Catalog/Model/Product/Type/Price.php +115 -31
  551. app/code/core/Mage/Catalog/Model/Product/Type/Simple.php +1 -1
  552. app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php +1 -1
  553. app/code/core/Mage/Catalog/Model/Product/Url.php +1 -1
  554. app/code/core/Mage/Catalog/Model/Product/Visibility.php +1 -1
  555. app/code/core/Mage/Catalog/Model/Product/Website.php +1 -1
  556. app/code/core/Mage/Catalog/Model/Resource/Abstract.php +2 -2
  557. app/code/core/Mage/Catalog/Model/Resource/Attribute.php +1 -1
  558. app/code/core/Mage/Catalog/Model/Resource/Category.php +1 -1
  559. app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Collection.php +1 -1
  560. app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php +1 -1
  561. app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Layout.php +1 -1
  562. app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Mode.php +1 -1
  563. app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Page.php +1 -1
  564. app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php +1 -1
  565. app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php +14 -7
  566. app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php +1 -1
  567. app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php +1 -1
  568. app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php +1 -1
  569. app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php +1 -1
  570. app/code/core/Mage/Catalog/Model/Resource/Config.php +1 -1
  571. app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php +4 -14
  572. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php +1 -1
  573. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php +1 -1
  574. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php +1 -1
  575. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php +1 -1
  576. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php +1 -1
  577. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php +1 -1
  578. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php +1 -1
  579. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php +1 -1
  580. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php +1 -1
  581. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php +1 -1
  582. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php +1 -1
  583. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php +1 -1
  584. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php +1 -1
  585. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php +1 -1
  586. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php +1 -1
  587. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php +1 -1
  588. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php +1 -1
  589. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Price.php +1 -1
  590. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php +1 -1
  591. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Action.php +1 -1
  592. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php +1 -1
  593. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php +1 -1
  594. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php +1 -1
  595. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php +1 -1
  596. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Collection.php +1 -1
  597. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php +1 -1
  598. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php +1 -1
  599. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php +1 -1
  600. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php +1 -1
  601. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php +1 -1
  602. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php +1 -1
  603. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php +1 -1
  604. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Abstract.php +2 -2
  605. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php +1 -1
  606. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Abstract.php +2 -2
  607. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php +1 -1
  608. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.php +1 -1
  609. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php +1 -1
  610. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Configurable.php +1 -1
  611. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php +1 -1
  612. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php +1 -1
  613. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Interface.php +2 -2
  614. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php +1 -1
  615. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php +1 -1
  616. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php +1 -1
  617. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php +1 -1
  618. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php +1 -1
  619. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php +1 -1
  620. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php +1 -1
  621. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Relation.php +1 -1
  622. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php +1 -1
  623. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php +1 -1
  624. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php +1 -1
  625. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php +1 -1
  626. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php +1 -1
  627. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php +1 -1
  628. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php +1 -1
  629. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php +1 -1
  630. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php +1 -1
  631. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php +1 -1
  632. app/code/core/Mage/Catalog/Model/Resource/Helper/Mysql4.php +1 -1
  633. app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Attribute.php +1 -1
  634. app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Decimal.php +3 -4
  635. app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php +258 -35
  636. app/code/core/Mage/Catalog/Model/Resource/Product.php +19 -7
  637. app/code/core/Mage/Catalog/Model/Resource/Product/Action.php +1 -1
  638. app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice.php +46 -0
  639. app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/Abstract.php +147 -0
  640. app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php +1 -1
  641. app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php +1 -1
  642. app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php +16 -76
  643. app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php +1 -1
  644. app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Collection.php +8 -5
  645. app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Image.php +1 -1
  646. app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Tierprice.php +1 -1
  647. app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php +299 -15
  648. app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php +1 -1
  649. app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item/Collection.php +1 -1
  650. app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php +1 -1
  651. app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php +1 -1
  652. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Abstract.php +1 -1
  653. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php +1 -1
  654. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Abstract.php +2 -2
  655. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php +1 -1
  656. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php +5 -5
  657. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php +58 -1
  658. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Configurable.php +23 -10
  659. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php +56 -19
  660. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Grouped.php +8 -7
  661. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Interface.php +1 -1
  662. app/code/core/Mage/Catalog/Model/Resource/Product/Link.php +1 -1
  663. app/code/core/Mage/Catalog/Model/Resource/Product/Link/Collection.php +1 -1
  664. app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php +1 -1
  665. app/code/core/Mage/Catalog/Model/Resource/Product/Option.php +8 -8
  666. app/code/core/Mage/Catalog/Model/Resource/Product/Option/Collection.php +43 -10
  667. app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php +1 -1
  668. app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value/Collection.php +1 -1
  669. app/code/core/Mage/Catalog/Model/Resource/Product/Relation.php +1 -1
  670. app/code/core/Mage/Catalog/Model/Resource/Product/Status.php +1 -1
  671. app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable.php +2 -5
  672. app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute.php +1 -1
  673. app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php +1 -1
  674. app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Product/Collection.php +1 -1
  675. app/code/core/Mage/Catalog/Model/Resource/Product/Website.php +1 -1
  676. app/code/core/Mage/Catalog/Model/Resource/Setup.php +14 -3
  677. app/code/core/Mage/Catalog/Model/Resource/Url.php +63 -18
  678. app/code/core/Mage/Catalog/Model/Session.php +1 -1
  679. app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Category/Flat.php +1 -1
  680. app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Product/Flat.php +1 -1
  681. app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php +1 -1
  682. app/code/core/Mage/Catalog/Model/Template/Filter.php +1 -1
  683. app/code/core/Mage/Catalog/Model/Url.php +96 -16
  684. app/code/core/Mage/Catalog/controllers/CategoryController.php +1 -1
  685. app/code/core/Mage/Catalog/controllers/IndexController.php +1 -1
  686. app/code/core/Mage/Catalog/controllers/Product/CompareController.php +5 -2
  687. app/code/core/Mage/Catalog/controllers/ProductController.php +5 -29
  688. app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php +1 -1
  689. app/code/core/Mage/Catalog/data/catalog_setup/data-install-1.6.0.0.php +1 -1
  690. app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.12-1.6.0.0.13.php +54 -0
  691. app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php +68 -0
  692. app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php +14 -15
  693. app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.8-1.6.0.0.9.php +36 -0
  694. app/code/core/Mage/Catalog/etc/adminhtml.xml +2 -2
  695. app/code/core/Mage/Catalog/etc/api.xml +1 -1
  696. app/code/core/Mage/Catalog/etc/api2.xml +370 -0
  697. app/code/core/Mage/Catalog/etc/config.xml +27 -2
  698. app/code/core/Mage/Catalog/etc/convert.xml +1 -1
  699. app/code/core/Mage/Catalog/etc/system.xml +50 -3
  700. app/code/core/Mage/Catalog/etc/widget.xml +1 -1
  701. app/code/core/Mage/Catalog/etc/wsdl.xml +2 -0
  702. app/code/core/Mage/Catalog/etc/wsi.xml +846 -0
  703. app/code/core/Mage/Catalog/sql/catalog_setup/install-1.6.0.0.php +21 -21
  704. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.57-0.7.58.php +1 -1
  705. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.63-0.7.64.php +1 -1
  706. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.28-1.4.0.0.29.php +1 -1
  707. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.42-1.4.0.0.43.php +1 -1
  708. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php +1 -1
  709. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php +1 -1
  710. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php +1 -1
  711. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php +1 -1
  712. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php +1 -1
  713. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php +1 -1
  714. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php +1 -1
  715. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php +1 -1
  716. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php +1 -1
  717. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php +1 -1
  718. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php +1 -1
  719. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php +1 -1
  720. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php +1 -1
  721. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php +1 -1
  722. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php +1 -1
  723. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php +1 -1
  724. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php +1 -1
  725. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php +1 -1
  726. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php +1 -1
  727. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php +1 -1
  728. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php +1 -1
  729. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php +1 -1
  730. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php +1 -1
  731. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php +1 -1
  732. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php +1 -1
  733. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php +1 -1
  734. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php +1 -1
  735. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php +1 -1
  736. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php +1 -1
  737. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php +1 -1
  738. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php +1 -1
  739. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php +1 -1
  740. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php +1 -1
  741. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php +1 -1
  742. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php +1 -1
  743. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php +1 -1
  744. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php +1 -1
  745. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php +1 -1
  746. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php +1 -1
  747. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php +1 -1
  748. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php +1 -1
  749. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php +1 -1
  750. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php +1 -1
  751. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php +1 -1
  752. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php +1 -1
  753. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php +1 -1
  754. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php +1 -1
  755. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php +1 -1
  756. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php +1 -1
  757. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php +1 -1
  758. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php +1 -1
  759. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php +1 -1
  760. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php +1 -1
  761. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php +1 -1
  762. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php +1 -1
  763. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php +1 -1
  764. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php +1 -1
  765. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php +1 -1
  766. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php +1 -1
  767. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php +1 -1
  768. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php +1 -1
  769. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php +1 -1
  770. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.65-0.7.66.php +1 -1
  771. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php +1 -1
  772. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php +1 -1
  773. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php +1 -1
  774. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.69-0.7.70.php +1 -1
  775. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php +1 -1
  776. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.70-0.7.71.php +1 -1
  777. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.71-0.7.72.php +1 -1
  778. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.72-0.7.73.php +1 -1
  779. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.73-1.4.0.0.0.php +1 -1
  780. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php +1 -1
  781. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php +1 -1
  782. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php +1 -1
  783. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php +1 -1
  784. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.11-1.4.0.0.12.php +1 -1
  785. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php +1 -1
  786. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.13-1.4.0.0.14.php +1 -1
  787. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.14-1.4.0.0.15.php +1 -1
  788. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.15-1.4.0.0.16.php +1 -1
  789. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.16-1.4.0.0.17.php +1 -1
  790. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.17-1.4.0.0.18.php +1 -1
  791. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.18-1.4.0.0.19.php +1 -1
  792. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.19-1.4.0.0.20.php +1 -1
  793. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php +1 -1
  794. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.20-1.4.0.0.21.php +1 -1
  795. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.21-1.4.0.0.22.php +1 -1
  796. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.22-1.4.0.0.23.php +1 -1
  797. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.23-1.4.0.0.24.php +1 -1
  798. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.24-1.4.0.0.25.php +1 -1
  799. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.25-1.4.0.0.26.php +1 -1
  800. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.26-1.4.0.0.27.php +1 -1
  801. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.27-1.4.0.0.28.php +1 -1
  802. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.28-1.4.0.0.29.php +1 -1
  803. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php +1 -1
  804. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.30-1.4.0.0.31.php +1 -1
  805. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.31-1.4.0.0.32.php +1 -1
  806. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.32-1.4.0.0.33.php +1 -1
  807. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.33-1.4.0.0.34.php +1 -1
  808. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.34-1.4.0.0.35.php +1 -1
  809. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.35-1.4.0.0.36.php +1 -1
  810. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.36-1.4.0.0.37.php +1 -1
  811. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.37-1.4.0.0.38.php +1 -1
  812. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.38-1.4.0.0.39.php +1 -1
  813. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.39-1.4.0.0.40.php +1 -1
  814. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php +1 -1
  815. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.40-1.4.0.0.41.php +1 -1
  816. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.41-1.4.0.0.42.php +1 -1
  817. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.43-1.4.0.0.44.php +1 -1
  818. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php +1 -1
  819. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php +1 -1
  820. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php +1 -1
  821. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php +1 -1
  822. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php +1 -1
  823. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1
  824. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.6.0.0.8-1.6.0.0.9.php +53 -0
  825. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.php +1 -1
  826. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php +1 -1
  827. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.10-1.6.0.0.11.php +31 -0
  828. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.11-1.6.0.0.12.php +34 -0
  829. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php +1 -1
  830. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.3-1.6.0.0.4.php +1 -1
  831. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.4-1.6.0.0.5.php +1 -1
  832. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.5-1.6.0.0.6.php +1 -1
  833. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.6-1.6.0.0.7.php +1 -1
  834. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.7-1.6.0.0.8.php +1 -1
  835. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.9-1.6.0.0.10.php +214 -0
  836. app/code/core/Mage/CatalogIndex/Model/Aggregation.php +1 -1
  837. app/code/core/Mage/CatalogIndex/Model/Attribute.php +1 -1
  838. app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php +1 -1
  839. app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php +1 -1
  840. app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php +1 -1
  841. app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php +1 -1
  842. app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php +1 -1
  843. app/code/core/Mage/CatalogIndex/Model/Data/Simple.php +1 -1
  844. app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php +1 -1
  845. app/code/core/Mage/CatalogIndex/Model/Indexer.php +1 -1
  846. app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php +1 -1
  847. app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php +1 -1
  848. app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php +1 -1
  849. app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php +1 -1
  850. app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php +1 -1
  851. app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php +1 -1
  852. app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php +1 -1
  853. app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php +1 -1
  854. app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php +1 -1
  855. app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php +1 -1
  856. app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php +1 -1
  857. app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php +1 -1
  858. app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php +1 -1
  859. app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php +1 -1
  860. app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php +1 -1
  861. app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php +1 -1
  862. app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php +1 -1
  863. app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php +1 -1
  864. app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php +1 -1
  865. app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php +1 -1
  866. app/code/core/Mage/CatalogIndex/Model/Observer.php +1 -1
  867. app/code/core/Mage/CatalogIndex/Model/Price.php +1 -1
  868. app/code/core/Mage/CatalogIndex/Model/Resource/Abstract.php +1 -1
  869. app/code/core/Mage/CatalogIndex/Model/Resource/Aggregation.php +1 -1
  870. app/code/core/Mage/CatalogIndex/Model/Resource/Attribute.php +1 -1
  871. app/code/core/Mage/CatalogIndex/Model/Resource/Data/Abstract.php +1 -1
  872. app/code/core/Mage/CatalogIndex/Model/Resource/Data/Configurable.php +1 -1
  873. app/code/core/Mage/CatalogIndex/Model/Resource/Data/Grouped.php +1 -1
  874. app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php +1 -1
  875. app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Abstract.php +1 -1
  876. app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Eav.php +1 -1
  877. app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Minimalprice.php +1 -1
  878. app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Price.php +1 -1
  879. app/code/core/Mage/CatalogIndex/Model/Resource/Price.php +1 -1
  880. app/code/core/Mage/CatalogIndex/Model/Resource/Retreiver.php +1 -1
  881. app/code/core/Mage/CatalogIndex/Model/Resource/Setup.php +1 -1
  882. app/code/core/Mage/CatalogIndex/Model/Retreiver.php +1 -1
  883. app/code/core/Mage/CatalogIndex/etc/config.xml +1 -1
  884. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/install-1.6.0.0.php +1 -1
  885. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php +1 -1
  886. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php +1 -1
  887. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php +1 -1
  888. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php +1 -1
  889. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php +1 -1
  890. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php +1 -1
  891. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php +1 -1
  892. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php +1 -1
  893. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php +1 -1
  894. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php +1 -1
  895. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php +1 -1
  896. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1
  897. app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php +1 -1
  898. app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php +1 -1
  899. app/code/core/Mage/CatalogInventory/Block/Qtyincrements.php +1 -4
  900. app/code/core/Mage/CatalogInventory/Block/Stockqty/Abstract.php +1 -1
  901. app/code/core/Mage/CatalogInventory/Block/Stockqty/Composite.php +1 -1
  902. app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php +1 -1
  903. app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Configurable.php +1 -1
  904. app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Grouped.php +1 -1
  905. app/code/core/Mage/CatalogInventory/Helper/Data.php +2 -1
  906. app/code/core/Mage/CatalogInventory/Helper/Minsaleqty.php +1 -1
  907. app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item.php +52 -0
  908. app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest.php +163 -0
  909. app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest/Admin/V1.php +36 -0
  910. app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Validator/Item.php +62 -0
  911. app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php +7 -2
  912. app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php +1 -1
  913. app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Configurable.php +1 -1
  914. app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php +1 -1
  915. app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php +1 -1
  916. app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Interface.php +2 -2
  917. app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php +1 -1
  918. app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php +1 -1
  919. app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php +1 -1
  920. app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php +1 -1
  921. app/code/core/Mage/CatalogInventory/Model/Observer.php +37 -4
  922. app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php +1 -12
  923. app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Configurable.php +1 -1
  924. app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Default.php +1 -1
  925. app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Grouped.php +1 -1
  926. app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Interface.php +1 -1
  927. app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php +1 -1
  928. app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php +1 -1
  929. app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item/Collection.php +1 -1
  930. app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php +1 -1
  931. app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php +1 -1
  932. app/code/core/Mage/CatalogInventory/Model/Source/Stock.php +1 -1
  933. app/code/core/Mage/CatalogInventory/Model/Stock.php +1 -1
  934. app/code/core/Mage/CatalogInventory/Model/Stock/Item.php +79 -99
  935. app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php +9 -1
  936. app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php +9 -1
  937. app/code/core/Mage/CatalogInventory/Model/Stock/Status.php +1 -1
  938. app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minqty.php +48 -0
  939. app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minsaleqty.php +1 -1
  940. app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php +1 -1
  941. app/code/core/Mage/CatalogInventory/etc/adminhtml.xml +1 -1
  942. app/code/core/Mage/CatalogInventory/etc/api.xml +1 -1
  943. app/code/core/Mage/CatalogInventory/etc/api2.xml +267 -0
  944. app/code/core/Mage/CatalogInventory/etc/config.xml +2 -2
  945. app/code/core/Mage/CatalogInventory/etc/system.xml +8 -2
  946. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/install-1.6.0.0.php +1 -1
  947. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php +1 -1
  948. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php +1 -1
  949. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php +1 -1
  950. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php +1 -1
  951. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php +1 -1
  952. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php +11 -15
  953. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.5-0.7.6.php +1 -1
  954. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.6-0.7.7.php +1 -1
  955. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.7-0.7.8.php +1 -1
  956. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1
  957. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php +34 -0
  958. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php +45 -0
  959. app/code/core/Mage/CatalogRule/Helper/Data.php +4 -6
  960. app/code/core/Mage/CatalogRule/Model/Flag.php +42 -0
  961. app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php +1 -1
  962. app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php +1 -1
  963. app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php +1 -1
  964. app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php +1 -1
  965. app/code/core/Mage/CatalogRule/Model/Observer.php +31 -11
  966. app/code/core/Mage/CatalogRule/Model/Resource/Rule.php +164 -101
  967. app/code/core/Mage/CatalogRule/Model/Resource/Rule/Collection.php +14 -32
  968. app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price.php +1 -1
  969. app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price/Collection.php +1 -1
  970. app/code/core/Mage/CatalogRule/Model/Rule.php +122 -113
  971. app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php +1 -1
  972. app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php +1 -1
  973. app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php +4 -2
  974. app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php +5 -478
  975. app/code/core/Mage/CatalogRule/Model/Rule/Product/Price.php +1 -1
  976. app/code/core/Mage/CatalogRule/etc/adminhtml.xml +1 -1
  977. app/code/core/Mage/CatalogRule/etc/config.xml +8 -2
  978. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/install-1.6.0.0.php +1 -1
  979. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php +1 -1
  980. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php +1 -1
  981. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php +1 -1
  982. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php +1 -1
  983. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php +1 -1
  984. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php +1 -1
  985. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php +1 -1
  986. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php +1 -1
  987. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.7-0.7.8.php +1 -1
  988. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.8-0.7.9.php +1 -1
  989. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.9-0.7.10.php +1 -1
  990. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1
  991. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.0-1.6.0.1.php +1 -1
  992. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.1-1.6.0.2.php +163 -0
  993. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.2-1.6.0.3.php +51 -0
  994. app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php +43 -6
  995. app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php +1 -1
  996. app/code/core/Mage/CatalogSearch/Block/Autocomplete.php +1 -1
  997. app/code/core/Mage/CatalogSearch/Block/Layer.php +1 -1
  998. app/code/core/Mage/CatalogSearch/Block/Layer/Filter/Attribute.php +1 -1
  999. app/code/core/Mage/CatalogSearch/Block/Result.php +1 -1
  1000. app/code/core/Mage/CatalogSearch/Block/Term.php +1 -1
  1001. app/code/core/Mage/CatalogSearch/Helper/Data.php +24 -35
  1002. app/code/core/Mage/CatalogSearch/Model/Advanced.php +1 -1
  1003. app/code/core/Mage/CatalogSearch/Model/Fulltext.php +24 -13
  1004. app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php +1 -1
  1005. app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php +1 -1
  1006. app/code/core/Mage/CatalogSearch/Model/Layer.php +1 -1
  1007. app/code/core/Mage/CatalogSearch/Model/Layer/Filter/Attribute.php +1 -1
  1008. app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced.php +1 -1
  1009. app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php +1 -1
  1010. app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php +1 -1
  1011. app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php +1 -1
  1012. app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php +1 -1
  1013. app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php +1 -1
  1014. app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php +1 -1
  1015. app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php +1 -1
  1016. app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php +1 -1
  1017. app/code/core/Mage/CatalogSearch/Model/Query.php +1 -1
  1018. app/code/core/Mage/CatalogSearch/Model/Resource/Advanced.php +1 -1
  1019. app/code/core/Mage/CatalogSearch/Model/Resource/Advanced/Collection.php +7 -1
  1020. app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php +130 -112
  1021. app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Collection.php +1 -1
  1022. app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Engine.php +12 -3
  1023. app/code/core/Mage/CatalogSearch/Model/Resource/Helper/Mysql4.php +1 -1
  1024. app/code/core/Mage/CatalogSearch/Model/Resource/Indexer/Fulltext.php +1 -1
  1025. app/code/core/Mage/CatalogSearch/Model/Resource/Query.php +1 -1
  1026. app/code/core/Mage/CatalogSearch/Model/Resource/Query/Collection.php +1 -1
  1027. app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php +1 -1
  1028. app/code/core/Mage/CatalogSearch/Model/Session.php +1 -1
  1029. app/code/core/Mage/CatalogSearch/Model/System/Config/Backend/Sitemap.php +1 -1
  1030. app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php +1 -1
  1031. app/code/core/Mage/CatalogSearch/controllers/AjaxController.php +1 -1
  1032. app/code/core/Mage/CatalogSearch/controllers/ResultController.php +2 -2
  1033. app/code/core/Mage/CatalogSearch/controllers/TermController.php +1 -1
  1034. app/code/core/Mage/CatalogSearch/etc/adminhtml.xml +1 -1
  1035. app/code/core/Mage/CatalogSearch/etc/config.xml +1 -1
  1036. app/code/core/Mage/CatalogSearch/etc/system.xml +5 -1
  1037. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/install-1.6.0.0.php +1 -1
  1038. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php +1 -1
  1039. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php +1 -1
  1040. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php +1 -1
  1041. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php +1 -1
  1042. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.4-0.7.5.php +1 -1
  1043. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.5-0.7.6.php +1 -1
  1044. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.6-0.7.7.php +1 -1
  1045. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1
  1046. app/code/core/Mage/Checkout/Block/Agreements.php +1 -1
  1047. app/code/core/Mage/Checkout/Block/Cart.php +1 -1
  1048. app/code/core/Mage/Checkout/Block/Cart/Abstract.php +2 -2
  1049. app/code/core/Mage/Checkout/Block/Cart/Coupon.php +1 -1
  1050. app/code/core/Mage/Checkout/Block/Cart/Crosssell.php +1 -1
  1051. app/code/core/Mage/Checkout/Block/Cart/Item/Configure.php +1 -1
  1052. app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php +59 -4
  1053. app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php +1 -1
  1054. app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php +1 -1
  1055. app/code/core/Mage/Checkout/Block/Cart/Shipping.php +87 -5
  1056. app/code/core/Mage/Checkout/Block/Cart/Sidebar.php +1 -1
  1057. app/code/core/Mage/Checkout/Block/Cart/Totals.php +1 -1
  1058. app/code/core/Mage/Checkout/Block/Links.php +6 -2
  1059. app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php +1 -1
  1060. app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php +1 -1
  1061. app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php +1 -1
  1062. app/code/core/Mage/Checkout/Block/Multishipping/Billing.php +1 -1
  1063. app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php +1 -1
  1064. app/code/core/Mage/Checkout/Block/Multishipping/Link.php +1 -1
  1065. app/code/core/Mage/Checkout/Block/Multishipping/Overview.php +1 -1
  1066. app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php +1 -1
  1067. app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php +1 -1
  1068. app/code/core/Mage/Checkout/Block/Multishipping/State.php +1 -1
  1069. app/code/core/Mage/Checkout/Block/Multishipping/Success.php +1 -1
  1070. app/code/core/Mage/Checkout/Block/Onepage.php +15 -143
  1071. app/code/core/Mage/Checkout/Block/Onepage/Abstract.php +13 -2
  1072. app/code/core/Mage/Checkout/Block/Onepage/Billing.php +1 -1
  1073. app/code/core/Mage/Checkout/Block/Onepage/Failure.php +1 -1
  1074. app/code/core/Mage/Checkout/Block/Onepage/Link.php +1 -1
  1075. app/code/core/Mage/Checkout/Block/Onepage/Login.php +1 -1
  1076. app/code/core/Mage/Checkout/Block/Onepage/Payment.php +1 -1
  1077. app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php +1 -1
  1078. app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php +1 -1
  1079. app/code/core/Mage/Checkout/Block/Onepage/Progress.php +25 -1
  1080. app/code/core/Mage/Checkout/Block/Onepage/Review.php +1 -1
  1081. app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php +1 -1
  1082. app/code/core/Mage/Checkout/Block/Onepage/Shipping.php +1 -1
  1083. app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php +1 -1
  1084. app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php +1 -1
  1085. app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php +1 -1
  1086. app/code/core/Mage/Checkout/Block/Onepage/Success.php +1 -1
  1087. app/code/core/Mage/Checkout/Block/Success.php +1 -1
  1088. app/code/core/Mage/Checkout/Block/Total/Default.php +1 -1
  1089. app/code/core/Mage/Checkout/Block/Total/Nominal.php +1 -1
  1090. app/code/core/Mage/Checkout/Block/Total/Tax.php +1 -1
  1091. app/code/core/Mage/Checkout/Controller/Action.php +1 -1
  1092. app/code/core/Mage/Checkout/Exception.php +1 -1
  1093. app/code/core/Mage/Checkout/Helper/Cart.php +1 -1
  1094. app/code/core/Mage/Checkout/Helper/Data.php +19 -6
  1095. app/code/core/Mage/Checkout/Helper/Url.php +11 -1
  1096. app/code/core/Mage/Checkout/Model/Agreement.php +1 -1
  1097. app/code/core/Mage/Checkout/Model/Api/Resource.php +1 -1
  1098. app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php +1 -1
  1099. app/code/core/Mage/Checkout/Model/Api/Resource/Product.php +1 -1
  1100. app/code/core/Mage/Checkout/Model/Cart.php +64 -17
  1101. app/code/core/Mage/Checkout/Model/Cart/Api.php +1 -1
  1102. app/code/core/Mage/Checkout/Model/Cart/Api/V2.php +1 -1
  1103. app/code/core/Mage/Checkout/Model/Cart/Coupon/Api.php +1 -1
  1104. app/code/core/Mage/Checkout/Model/Cart/Coupon/Api/V2.php +1 -1
  1105. app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php +1 -1
  1106. app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php +1 -1
  1107. app/code/core/Mage/Checkout/Model/Cart/Interface.php +69 -0
  1108. app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php +1 -1
  1109. app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.php +1 -1
  1110. app/code/core/Mage/Checkout/Model/Cart/Product/Api.php +21 -22
  1111. app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php +5 -5
  1112. app/code/core/Mage/Checkout/Model/Cart/Shipping/Api.php +1 -1
  1113. app/code/core/Mage/Checkout/Model/Cart/Shipping/Api/V2.php +1 -1
  1114. app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php +1 -1
  1115. app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php +1 -1
  1116. app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php +1 -1
  1117. app/code/core/Mage/Checkout/Model/Mysql4/Cart.php +1 -1
  1118. app/code/core/Mage/Checkout/Model/Mysql4/Setup.php +1 -1
  1119. app/code/core/Mage/Checkout/Model/Observer.php +1 -1
  1120. app/code/core/Mage/Checkout/Model/Resource/Agreement.php +1 -1
  1121. app/code/core/Mage/Checkout/Model/Resource/Agreement/Collection.php +1 -1
  1122. app/code/core/Mage/Checkout/Model/Resource/Cart.php +1 -1
  1123. app/code/core/Mage/Checkout/Model/Resource/Setup.php +1 -1
  1124. app/code/core/Mage/Checkout/Model/Session.php +12 -8
  1125. app/code/core/Mage/Checkout/Model/Type/Abstract.php +1 -1
  1126. app/code/core/Mage/Checkout/Model/Type/Multishipping.php +9 -14
  1127. app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php +1 -1
  1128. app/code/core/Mage/Checkout/Model/Type/Onepage.php +40 -34
  1129. app/code/core/Mage/Checkout/controllers/CartController.php +57 -12
  1130. app/code/core/Mage/Checkout/controllers/IndexController.php +1 -1
  1131. app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php +2 -2
  1132. app/code/core/Mage/Checkout/controllers/MultishippingController.php +1 -1
  1133. app/code/core/Mage/Checkout/controllers/OnepageController.php +28 -20
  1134. app/code/core/Mage/Checkout/etc/adminhtml.xml +1 -1
  1135. app/code/core/Mage/Checkout/etc/api.xml +1 -1
  1136. app/code/core/Mage/Checkout/etc/config.xml +1 -1
  1137. app/code/core/Mage/Checkout/etc/jstranslator.xml +46 -0
  1138. app/code/core/Mage/Checkout/etc/system.xml +11 -1
  1139. app/code/core/Mage/Checkout/sql/checkout_setup/install-1.6.0.0.php +1 -1
  1140. app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php +1 -1
  1141. app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php +1 -1
  1142. app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php +1 -1
  1143. app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.2-0.9.3.php +1 -1
  1144. app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.3-0.9.4.php +1 -1
  1145. app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.4-0.9.5.php +1 -1
  1146. app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1
  1147. app/code/core/Mage/Cms/Block/Block.php +1 -1
  1148. app/code/core/Mage/Cms/Block/Page.php +2 -2
  1149. app/code/core/Mage/Cms/Block/Widget/Block.php +1 -1
  1150. app/code/core/Mage/Cms/Block/Widget/Page/Link.php +1 -1
  1151. app/code/core/Mage/Cms/Controller/Router.php +1 -1
  1152. app/code/core/Mage/Cms/Helper/Data.php +1 -1
  1153. app/code/core/Mage/Cms/Helper/Page.php +13 -8
  1154. app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php +1 -1
  1155. app/code/core/Mage/Cms/Model/Block.php +1 -1
  1156. app/code/core/Mage/Cms/Model/Mysql4/Block.php +1 -1
  1157. app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php +1 -1
  1158. app/code/core/Mage/Cms/Model/Mysql4/Page.php +1 -1
  1159. app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php +1 -1
  1160. app/code/core/Mage/Cms/Model/Mysql4/Page/Service.php +1 -1
  1161. app/code/core/Mage/Cms/Model/Observer.php +1 -1
  1162. app/code/core/Mage/Cms/Model/Page.php +1 -1
  1163. app/code/core/Mage/Cms/Model/Resource/Block.php +2 -1
  1164. app/code/core/Mage/Cms/Model/Resource/Block/Collection.php +1 -1
  1165. app/code/core/Mage/Cms/Model/Resource/Page.php +1 -1
  1166. app/code/core/Mage/Cms/Model/Resource/Page/Collection.php +1 -1
  1167. app/code/core/Mage/Cms/Model/Resource/Page/Service.php +1 -1
  1168. app/code/core/Mage/Cms/Model/Template/Filter.php +1 -1
  1169. app/code/core/Mage/Cms/Model/Wysiwyg/Config.php +1 -1
  1170. app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php +1 -1
  1171. app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage/Collection.php +1 -1
  1172. app/code/core/Mage/Cms/controllers/IndexController.php +1 -1
  1173. app/code/core/Mage/Cms/controllers/PageController.php +1 -1
  1174. app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php +1 -1
  1175. app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.0-1.6.0.0.1.php +272 -0
  1176. app/code/core/Mage/Cms/etc/adminhtml.xml +1 -1
  1177. app/code/core/Mage/Cms/etc/config.xml +2 -2
  1178. app/code/core/Mage/Cms/etc/system.xml +1 -1
  1179. app/code/core/Mage/Cms/etc/widget.xml +1 -1
  1180. app/code/core/Mage/Cms/sql/cms_setup/install-1.6.0.0.php +3 -3
  1181. app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php +1 -1
  1182. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php +1 -1
  1183. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php +1 -1
  1184. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.10-0.7.11.php +1 -1
  1185. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.11-0.7.12.php +1 -1
  1186. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.12-0.7.13.php +1 -1
  1187. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php +1 -1
  1188. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php +1 -1
  1189. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php +1 -1
  1190. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.7-0.7.8.php +1 -1
  1191. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.8-0.7.9.php +1 -1
  1192. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.9-0.7.10.php +1 -1
  1193. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +1 -1
  1194. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit.php +1 -1
  1195. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Form.php +1 -1
  1196. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Abstract.php +3 -3
  1197. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Authors.php +1 -1
  1198. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Contents.php +1 -1
  1199. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Depends.php +1 -1
  1200. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Grid.php +1 -1
  1201. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Load.php +1 -1
  1202. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Local.php +1 -1
  1203. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Package.php +1 -1
  1204. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Release.php +1 -1
  1205. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tabs.php +1 -1
  1206. app/code/core/Mage/Connect/Helper/Data.php +1 -1
  1207. app/code/core/Mage/Connect/Model/Extension.php +7 -5
  1208. app/code/core/Mage/Connect/Model/Extension/Collection.php +1 -1
  1209. app/code/core/Mage/Connect/Model/Session.php +1 -1
  1210. app/code/core/Mage/Connect/controllers/Adminhtml/Extension/CustomController.php +1 -3
  1211. app/code/core/Mage/Connect/controllers/Adminhtml/Extension/LocalController.php +1 -1
  1212. app/code/core/Mage/Connect/etc/adminhtml.xml +1 -1
  1213. app/code/core/Mage/Connect/etc/config.xml +1 -1
  1214. app/code/core/Mage/Contacts/Helper/Data.php +1 -1
  1215. app/code/core/Mage/Contacts/Model/System/Config/Backend/Links.php +1 -1
  1216. app/code/core/Mage/Contacts/controllers/IndexController.php +1 -1
  1217. app/code/core/Mage/Contacts/etc/adminhtml.xml +1 -1
  1218. app/code/core/Mage/Contacts/etc/config.xml +1 -1
  1219. app/code/core/Mage/Contacts/etc/system.xml +2 -1
  1220. app/code/core/Mage/Contacts/sql/contacts_setup/install-1.6.0.0.php +1 -1
  1221. app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php +1 -1
  1222. app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php +1 -1
  1223. app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php +1 -1
  1224. app/code/core/Mage/Core/Block/Abstract.php +5 -5
  1225. app/code/core/Mage/Core/Block/Flush.php +1 -1
  1226. app/code/core/Mage/Core/Block/Html/Calendar.php +1 -1
  1227. app/code/core/Mage/Core/Block/Html/Date.php +1 -1
  1228. app/code/core/Mage/Core/Block/Html/Link.php +1 -1
  1229. app/code/core/Mage/Core/Block/Html/Select.php +87 -18
  1230. app/code/core/Mage/Core/Block/Messages.php +1 -1
  1231. app/code/core/Mage/Core/Block/Profiler.php +1 -1
  1232. app/code/core/Mage/Core/Block/Store/Switcher.php +1 -1
  1233. app/code/core/Mage/Core/Block/Template.php +1 -1
  1234. app/code/core/Mage/Core/Block/Template/Facade.php +1 -1
  1235. app/code/core/Mage/Core/Block/Template/Smarty.php +1 -1
  1236. app/code/core/Mage/Core/Block/Template/Zend.php +1 -1
  1237. app/code/core/Mage/Core/Block/Text.php +1 -1
  1238. app/code/core/Mage/Core/Block/Text/List.php +1 -1
  1239. app/code/core/Mage/Core/Block/Text/List/Item.php +1 -1
  1240. app/code/core/Mage/Core/Block/Text/List/Link.php +1 -1
  1241. app/code/core/Mage/Core/Block/Text/Tag.php +1 -1
  1242. app/code/core/Mage/Core/Block/Text/Tag/Css.php +1 -1
  1243. app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php +1 -1
  1244. app/code/core/Mage/Core/Block/Text/Tag/Debug.php +1 -1
  1245. app/code/core/Mage/Core/Block/Text/Tag/Js.php +1 -1
  1246. app/code/core/Mage/Core/Block/Text/Tag/Meta.php +1 -1
  1247. app/code/core/Mage/Core/Controller/Front/Action.php +11 -4
  1248. app/code/core/Mage/Core/Controller/Front/Router.php +1 -1
  1249. app/code/core/Mage/Core/Controller/Request/Http.php +2 -2
  1250. app/code/core/Mage/Core/Controller/Response/Http.php +3 -2
  1251. app/code/core/Mage/Core/Controller/Varien/Action.php +83 -37
  1252. app/code/core/Mage/Core/Controller/Varien/Exception.php +1 -1
  1253. app/code/core/Mage/Core/Controller/Varien/Front.php +57 -23
  1254. app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php +1 -1
  1255. app/code/core/Mage/Core/Controller/Varien/Router/Admin.php +5 -5
  1256. app/code/core/Mage/Core/Controller/Varien/Router/Default.php +1 -1
  1257. app/code/core/Mage/Core/Controller/Varien/Router/Standard.php +20 -12
  1258. app/code/core/Mage/Core/Exception.php +1 -1
  1259. app/code/core/Mage/Core/Helper/Abstract.php +35 -6
  1260. app/code/core/Mage/Core/Helper/Cookie.php +96 -0
  1261. app/code/core/Mage/Core/Helper/Data.php +102 -30
  1262. app/code/core/Mage/Core/Helper/File/Storage.php +1 -1
  1263. app/code/core/Mage/Core/Helper/File/Storage/Database.php +1 -1
  1264. app/code/core/Mage/Core/Helper/Hint.php +80 -0
  1265. app/code/core/Mage/Core/Helper/Http.php +1 -1
  1266. app/code/core/Mage/Core/Helper/Js.php +60 -98
  1267. app/code/core/Mage/Core/Helper/String.php +8 -4
  1268. app/code/core/Mage/Core/Helper/Translate.php +6 -6
  1269. app/code/core/Mage/Core/Helper/Url.php +1 -1
  1270. app/code/core/Mage/Core/Helper/Url/Rewrite.php +1 -1
  1271. app/code/core/Mage/Core/Model/Abstract.php +1 -1
  1272. app/code/core/Mage/Core/Model/App.php +42 -7
  1273. app/code/core/Mage/Core/Model/App/Area.php +1 -1
  1274. app/code/core/Mage/Core/Model/App/Emulation.php +1 -1
  1275. app/code/core/Mage/Core/Model/Cache.php +13 -6
  1276. app/code/core/Mage/Core/Model/Calculator.php +87 -0
  1277. app/code/core/Mage/Core/Model/Config.php +14 -15
  1278. app/code/core/Mage/Core/Model/Config/Base.php +1 -1
  1279. app/code/core/Mage/Core/Model/Config/Data.php +1 -1
  1280. app/code/core/Mage/Core/Model/Config/Element.php +1 -1
  1281. app/code/core/Mage/Core/Model/Config/Options.php +1 -1
  1282. app/code/core/Mage/Core/Model/Config/System.php +1 -1
  1283. app/code/core/Mage/Core/Model/Convert.php +1 -1
  1284. app/code/core/Mage/Core/Model/Cookie.php +2 -1
  1285. app/code/core/Mage/Core/Model/Date.php +28 -8
  1286. app/code/core/Mage/Core/Model/Design.php +2 -2
  1287. app/code/core/Mage/Core/Model/Design/Package.php +29 -8
  1288. app/code/core/Mage/Core/Model/Design/Source/Apply.php +1 -1
  1289. app/code/core/Mage/Core/Model/Design/Source/Design.php +1 -1
  1290. app/code/core/Mage/Core/Model/Email.php +1 -1
  1291. app/code/core/Mage/Core/Model/Email/Info.php +1 -1
  1292. app/code/core/Mage/Core/Model/Email/Template.php +55 -11
  1293. app/code/core/Mage/Core/Model/Email/Template/Filter.php +1 -1
  1294. app/code/core/Mage/Core/Model/Email/Template/Mailer.php +1 -1
  1295. app/code/core/Mage/Core/Model/Email/Transport.php +1 -1
  1296. app/code/core/Mage/Core/Model/Encryption.php +1 -1
  1297. app/code/core/Mage/Core/Model/File/Storage.php +1 -1
  1298. app/code/core/Mage/Core/Model/File/Storage/Abstract.php +1 -1
  1299. app/code/core/Mage/Core/Model/File/Storage/Database.php +13 -1
  1300. app/code/core/Mage/Core/Model/File/Storage/Database/Abstract.php +1 -1
  1301. app/code/core/Mage/Core/Model/File/Storage/Directory/Database.php +1 -1
  1302. app/code/core/Mage/Core/Model/File/Storage/File.php +1 -1
  1303. app/code/core/Mage/Core/Model/File/Storage/Flag.php +1 -1
  1304. app/code/core/Mage/Core/Model/File/Uploader.php +1 -1
  1305. app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php +1 -1
  1306. app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php +2 -5
  1307. app/code/core/Mage/Core/Model/Flag.php +1 -1
  1308. app/code/core/Mage/Core/Model/Input/Filter.php +366 -0
  1309. app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php +1 -1
  1310. app/code/core/Mage/Core/Model/Language.php +1 -1
  1311. app/code/core/Mage/Core/Model/Layout.php +35 -9
  1312. app/code/core/Mage/Core/Model/Layout/Data.php +1 -1
  1313. app/code/core/Mage/Core/Model/Layout/Element.php +1 -1
  1314. app/code/core/Mage/Core/Model/Layout/Update.php +16 -3
  1315. app/code/core/Mage/Core/Model/Locale.php +39 -21
  1316. app/code/core/Mage/Core/Model/Locale/Config.php +1 -1
  1317. app/code/core/Mage/Core/Model/Log/Adapter.php +1 -1
  1318. app/code/core/Mage/Core/Model/Magento/Api.php +49 -0
  1319. app/code/core/Mage/Core/Model/Magento/Api/V2.php +36 -0
  1320. app/code/core/Mage/Core/Model/Message.php +1 -1
  1321. app/code/core/Mage/Core/Model/Message/Abstract.php +13 -1
  1322. app/code/core/Mage/Core/Model/Message/Collection.php +1 -1
  1323. app/code/core/Mage/Core/Model/Message/Error.php +1 -1
  1324. app/code/core/Mage/Core/Model/Message/Notice.php +1 -1
  1325. app/code/core/Mage/Core/Model/Message/Success.php +1 -1
  1326. app/code/core/Mage/Core/Model/Message/Warning.php +1 -1
  1327. app/code/core/Mage/Core/Model/Mysql4/Abstract.php +1 -1
  1328. app/code/core/Mage/Core/Model/Mysql4/Cache.php +1 -1
  1329. app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php +1 -1
  1330. app/code/core/Mage/Core/Model/Mysql4/Config.php +1 -1
  1331. app/code/core/Mage/Core/Model/Mysql4/Config/Data.php +1 -1
  1332. app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php +1 -1
  1333. app/code/core/Mage/Core/Model/Mysql4/Design.php +1 -1
  1334. app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php +1 -1
  1335. app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php +1 -1
  1336. app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php +1 -1
  1337. app/code/core/Mage/Core/Model/Mysql4/Email/Template.php +1 -1
  1338. app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php +1 -1
  1339. app/code/core/Mage/Core/Model/Mysql4/File/Storage/Abstract.php +1 -1
  1340. app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php +1 -1
  1341. app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php +1 -1
  1342. app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php +1 -1
  1343. app/code/core/Mage/Core/Model/Mysql4/Flag.php +1 -1
  1344. app/code/core/Mage/Core/Model/Mysql4/Language.php +1 -1
  1345. app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php +1 -1
  1346. app/code/core/Mage/Core/Model/Mysql4/Layout.php +1 -1
  1347. app/code/core/Mage/Core/Model/Mysql4/Resource.php +1 -1
  1348. app/code/core/Mage/Core/Model/Mysql4/Session.php +1 -1
  1349. app/code/core/Mage/Core/Model/Mysql4/Store.php +1 -1
  1350. app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php +1 -1
  1351. app/code/core/Mage/Core/Model/Mysql4/Store/Group.php +1 -1
  1352. app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php +1 -1
  1353. app/code/core/Mage/Core/Model/Mysql4/Translate.php +1 -1
  1354. app/code/core/Mage/Core/Model/Mysql4/Translate/String.php +1 -1
  1355. app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php +1 -1
  1356. app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php +1 -1
  1357. app/code/core/Mage/Core/Model/Mysql4/Variable.php +1 -1
  1358. app/code/core/Mage/Core/Model/Mysql4/Variable/Collection.php +1 -1
  1359. app/code/core/Mage/Core/Model/Mysql4/Website.php +1 -1
  1360. app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php +1 -1
  1361. app/code/core/Mage/Core/Model/Observer.php +12 -1
  1362. app/code/core/Mage/Core/Model/Resource.php +1 -1
  1363. app/code/core/Mage/Core/Model/Resource/Abstract.php +2 -2
  1364. app/code/core/Mage/Core/Model/Resource/Cache.php +1 -1
  1365. app/code/core/Mage/Core/Model/Resource/Config.php +1 -1
  1366. app/code/core/Mage/Core/Model/Resource/Config/Data.php +1 -1
  1367. app/code/core/Mage/Core/Model/Resource/Config/Data/Collection.php +1 -1
  1368. app/code/core/Mage/Core/Model/Resource/Db/Abstract.php +8 -3
  1369. app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php +8 -7
  1370. app/code/core/Mage/Core/Model/Resource/Design.php +1 -1
  1371. app/code/core/Mage/Core/Model/Resource/Design/Collection.php +2 -2
  1372. app/code/core/Mage/Core/Model/Resource/Design/Package/Collection.php +1 -1
  1373. app/code/core/Mage/Core/Model/Resource/Email/Template.php +1 -1
  1374. app/code/core/Mage/Core/Model/Resource/Email/Template/Collection.php +1 -1
  1375. app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php +1 -1
  1376. app/code/core/Mage/Core/Model/Resource/Entity/Table.php +1 -1
  1377. app/code/core/Mage/Core/Model/Resource/File/Storage/Abstract.php +1 -1
  1378. app/code/core/Mage/Core/Model/Resource/File/Storage/Database.php +1 -1
  1379. app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php +1 -1
  1380. app/code/core/Mage/Core/Model/Resource/File/Storage/File.php +1 -1
  1381. app/code/core/Mage/Core/Model/Resource/Flag.php +1 -1
  1382. app/code/core/Mage/Core/Model/Resource/Helper/Abstract.php +1 -1
  1383. app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php +1 -1
  1384. app/code/core/Mage/Core/Model/Resource/Iterator.php +2 -2
  1385. app/code/core/Mage/Core/Model/Resource/Language.php +1 -1
  1386. app/code/core/Mage/Core/Model/Resource/Language/Collection.php +1 -1
  1387. app/code/core/Mage/Core/Model/Resource/Layout.php +1 -1
  1388. app/code/core/Mage/Core/Model/Resource/Resource.php +1 -1
  1389. app/code/core/Mage/Core/Model/Resource/Session.php +1 -1
  1390. app/code/core/Mage/Core/Model/Resource/Setup.php +1 -1
  1391. app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php +1 -1
  1392. app/code/core/Mage/Core/Model/Resource/Store.php +1 -1
  1393. app/code/core/Mage/Core/Model/Resource/Store/Collection.php +1 -1
  1394. app/code/core/Mage/Core/Model/Resource/Store/Group.php +1 -1
  1395. app/code/core/Mage/Core/Model/Resource/Store/Group/Collection.php +19 -12
  1396. app/code/core/Mage/Core/Model/Resource/Transaction.php +1 -1
  1397. app/code/core/Mage/Core/Model/Resource/Translate.php +1 -1
  1398. app/code/core/Mage/Core/Model/Resource/Translate/String.php +1 -1
  1399. app/code/core/Mage/Core/Model/Resource/Type/Abstract.php +1 -1
  1400. app/code/core/Mage/Core/Model/Resource/Type/Db.php +1 -1
  1401. app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php +1 -1
  1402. app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php +1 -1
  1403. app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php +1 -1
  1404. app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php +4 -1
  1405. app/code/core/Mage/Core/Model/Resource/Url/Rewrite/Collection.php +1 -1
  1406. app/code/core/Mage/Core/Model/Resource/Variable.php +5 -6
  1407. app/code/core/Mage/Core/Model/Resource/Variable/Collection.php +1 -1
  1408. app/code/core/Mage/Core/Model/Resource/Website.php +1 -1
  1409. app/code/core/Mage/Core/Model/Resource/Website/Collection.php +1 -1
  1410. app/code/core/Mage/Core/Model/Session.php +4 -1
  1411. app/code/core/Mage/Core/Model/Session/Abstract.php +45 -29
  1412. app/code/core/Mage/Core/Model/Session/Abstract/Varien.php +13 -3
  1413. app/code/core/Mage/Core/Model/Session/Abstract/Zend.php +1 -1
  1414. app/code/core/Mage/Core/Model/Session/Exception.php +1 -1
  1415. app/code/core/Mage/Core/Model/Source/Email/Variables.php +14 -15
  1416. app/code/core/Mage/Core/Model/Store.php +28 -14
  1417. app/code/core/Mage/Core/Model/Store/Api.php +1 -1
  1418. app/code/core/Mage/Core/Model/Store/Api/V2.php +1 -1
  1419. app/code/core/Mage/Core/Model/Store/Exception.php +1 -1
  1420. app/code/core/Mage/Core/Model/Store/Group.php +41 -1
  1421. app/code/core/Mage/Core/Model/Template.php +1 -1
  1422. app/code/core/Mage/Core/Model/Translate.php +1 -1
  1423. app/code/core/Mage/Core/Model/Translate/Expr.php +1 -1
  1424. app/code/core/Mage/Core/Model/Translate/Inline.php +244 -111
  1425. app/code/core/Mage/Core/Model/Translate/String.php +1 -1
  1426. app/code/core/Mage/Core/Model/Url.php +86 -24
  1427. app/code/core/Mage/Core/Model/Url/Rewrite.php +1 -1
  1428. app/code/core/Mage/Core/Model/Url/Validator.php +78 -0
  1429. app/code/core/Mage/Core/Model/Variable.php +1 -1
  1430. app/code/core/Mage/Core/Model/Variable/Config.php +1 -1
  1431. app/code/core/Mage/Core/Model/Variable/Observer.php +1 -1
  1432. app/code/core/Mage/Core/Model/Website.php +1 -1
  1433. app/code/core/Mage/Core/controllers/AjaxController.php +4 -3
  1434. app/code/core/Mage/Core/controllers/IndexController.php +1 -1
  1435. app/code/core/Mage/Core/etc/api.xml +20 -1
  1436. app/code/core/Mage/Core/etc/config.xml +20 -3
  1437. app/code/core/Mage/Core/etc/jstranslator.xml +205 -0
  1438. app/code/core/Mage/Core/etc/system.xml +84 -13
  1439. app/code/core/Mage/Core/etc/wsdl.xml +26 -0
  1440. app/code/core/Mage/Core/etc/wsi.xml +40 -0
  1441. app/code/core/Mage/Core/functions.php +1 -1
  1442. app/code/core/Mage/Core/sql/core_setup/install-1.6.0.0.php +1 -1
  1443. app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.7.0.php +1 -1
  1444. app/code/core/Mage/Core/sql/core_setup/mysql4-install-0.8.0.php +1 -1
  1445. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.6.26-0.7.0.php +1 -1
  1446. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.1-0.7.2.php +1 -1
  1447. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.2-0.7.3.php +1 -1
  1448. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.3-0.7.4.php +1 -1
  1449. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.4-0.7.5.php +1 -1
  1450. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.5-0.7.6.php +1 -1
  1451. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.6-0.7.7.php +1 -1
  1452. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.7-0.7.8.php +1 -1
  1453. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.7.8-0.7.9.php +1 -1
  1454. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.0-0.8.1.php +1 -1
  1455. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.1-0.8.2.php +1 -1
  1456. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.10-0.8.11.php +1 -1
  1457. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.11-0.8.12.php +1 -1
  1458. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.12-0.8.13.php +1 -1
  1459. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.13-0.8.14.php +1 -1
  1460. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.14-0.8.15.php +1 -1
  1461. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.15-0.8.16.php +1 -1
  1462. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.16-0.8.17.php +1 -1
  1463. app/code/core/Mage/Core/sql/core_setup/mysql4-upgrade-0.8.17-0.8.18.php +1 -1