Mage_Core_Modules - Version 1.9.1.0

Version Notes

1.9.1.0

Download this release

Release Info

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


Code changes from version 1.9.0.1 to 1.9.1.0

Files changed (4117) hide show
  1. app/Mage.php +2 -2
  2. app/code/core/Mage/Admin/Helper/Data.php +4 -4
  3. app/code/core/Mage/Admin/Model/Acl.php +4 -4
  4. app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php +4 -4
  5. app/code/core/Mage/Admin/Model/Acl/Assert/Time.php +4 -4
  6. app/code/core/Mage/Admin/Model/Acl/Resource.php +4 -4
  7. app/code/core/Mage/Admin/Model/Acl/Role.php +4 -4
  8. app/code/core/Mage/Admin/Model/Acl/Role/Generic.php +4 -4
  9. app/code/core/Mage/Admin/Model/Acl/Role/Group.php +4 -4
  10. app/code/core/Mage/Admin/Model/Acl/Role/Registry.php +4 -4
  11. app/code/core/Mage/Admin/Model/Acl/Role/User.php +4 -4
  12. app/code/core/Mage/Admin/Model/Config.php +4 -4
  13. app/code/core/Mage/Admin/Model/Mysql4/Acl.php +4 -4
  14. app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php +4 -4
  15. app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php +4 -4
  16. app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php +4 -4
  17. app/code/core/Mage/Admin/Model/Mysql4/Role.php +4 -4
  18. app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php +4 -4
  19. app/code/core/Mage/Admin/Model/Mysql4/Roles.php +4 -4
  20. app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php +4 -4
  21. app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php +4 -4
  22. app/code/core/Mage/Admin/Model/Mysql4/Rules.php +4 -4
  23. app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php +4 -4
  24. app/code/core/Mage/Admin/Model/Mysql4/User.php +4 -4
  25. app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php +4 -4
  26. app/code/core/Mage/Admin/Model/Observer.php +4 -4
  27. app/code/core/Mage/Admin/Model/Redirectpolicy.php +4 -4
  28. app/code/core/Mage/Admin/Model/Resource/Acl.php +4 -4
  29. app/code/core/Mage/Admin/Model/Resource/Acl/Role.php +4 -4
  30. app/code/core/Mage/Admin/Model/Resource/Acl/Role/Collection.php +4 -4
  31. app/code/core/Mage/Admin/Model/Resource/Permissions/Collection.php +4 -4
  32. app/code/core/Mage/Admin/Model/Resource/Role.php +4 -4
  33. app/code/core/Mage/Admin/Model/Resource/Role/Collection.php +4 -4
  34. app/code/core/Mage/Admin/Model/Resource/Roles.php +4 -4
  35. app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php +4 -4
  36. app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php +4 -4
  37. app/code/core/Mage/Admin/Model/Resource/Rules.php +4 -4
  38. app/code/core/Mage/Admin/Model/Resource/Rules/Collection.php +4 -4
  39. app/code/core/Mage/Admin/Model/Resource/User.php +4 -4
  40. app/code/core/Mage/Admin/Model/Resource/User/Collection.php +4 -4
  41. app/code/core/Mage/Admin/Model/Role.php +4 -4
  42. app/code/core/Mage/Admin/Model/Roles.php +4 -4
  43. app/code/core/Mage/Admin/Model/Rules.php +4 -4
  44. app/code/core/Mage/Admin/Model/Session.php +4 -4
  45. app/code/core/Mage/Admin/Model/User.php +53 -5
  46. app/code/core/Mage/Admin/data/admin_setup/data-install-1.6.0.0.php +4 -4
  47. app/code/core/Mage/Admin/etc/config.xml +3 -3
  48. app/code/core/Mage/Admin/sql/admin_setup/install-1.6.0.0.php +4 -4
  49. app/code/core/Mage/Admin/sql/admin_setup/mysql4-install-0.7.0.php +4 -4
  50. app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.0-0.7.1.php +4 -4
  51. app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-0.7.1-0.7.2.php +4 -4
  52. app/code/core/Mage/Admin/sql/admin_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +4 -4
  53. app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.0.0-1.6.1.0.php +4 -4
  54. app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.0-1.6.1.1.php +4 -4
  55. app/code/core/Mage/AdminNotification/Helper/Data.php +4 -4
  56. app/code/core/Mage/AdminNotification/Model/Feed.php +4 -4
  57. app/code/core/Mage/AdminNotification/Model/Inbox.php +4 -4
  58. app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php +4 -4
  59. app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox/Collection.php +4 -4
  60. app/code/core/Mage/AdminNotification/Model/Observer.php +4 -4
  61. app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php +4 -4
  62. app/code/core/Mage/AdminNotification/Model/Resource/Inbox/Collection.php +4 -4
  63. app/code/core/Mage/AdminNotification/Model/Survey.php +4 -4
  64. app/code/core/Mage/AdminNotification/etc/adminhtml.xml +3 -3
  65. app/code/core/Mage/AdminNotification/etc/config.xml +3 -3
  66. app/code/core/Mage/AdminNotification/etc/system.xml +3 -3
  67. app/code/core/Mage/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php +4 -4
  68. app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-install-1.0.0.php +4 -4
  69. app/code/core/Mage/AdminNotification/sql/adminnotification_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +4 -4
  70. app/code/core/Mage/Api/Controller/Action.php +4 -4
  71. app/code/core/Mage/Api/Exception.php +4 -4
  72. app/code/core/Mage/Api/Helper/Data.php +4 -4
  73. app/code/core/Mage/Api/Model/Acl.php +4 -4
  74. app/code/core/Mage/Api/Model/Acl/Assert/Ip.php +4 -4
  75. app/code/core/Mage/Api/Model/Acl/Assert/Time.php +4 -4
  76. app/code/core/Mage/Api/Model/Acl/Resource.php +4 -4
  77. app/code/core/Mage/Api/Model/Acl/Role.php +4 -4
  78. app/code/core/Mage/Api/Model/Acl/Role/Generic.php +4 -4
  79. app/code/core/Mage/Api/Model/Acl/Role/Group.php +4 -4
  80. app/code/core/Mage/Api/Model/Acl/Role/Registry.php +4 -4
  81. app/code/core/Mage/Api/Model/Acl/Role/User.php +4 -4
  82. app/code/core/Mage/Api/Model/Config.php +4 -4
  83. app/code/core/Mage/Api/Model/Mysql4/Acl.php +4 -4
  84. app/code/core/Mage/Api/Model/Mysql4/Acl/Role.php +4 -4
  85. app/code/core/Mage/Api/Model/Mysql4/Acl/Role/Collection.php +4 -4
  86. app/code/core/Mage/Api/Model/Mysql4/Permissions/Collection.php +4 -4
  87. app/code/core/Mage/Api/Model/Mysql4/Role.php +4 -4
  88. app/code/core/Mage/Api/Model/Mysql4/Role/Collection.php +4 -4
  89. app/code/core/Mage/Api/Model/Mysql4/Roles.php +4 -4
  90. app/code/core/Mage/Api/Model/Mysql4/Roles/Collection.php +4 -4
  91. app/code/core/Mage/Api/Model/Mysql4/Roles/User/Collection.php +4 -4
  92. app/code/core/Mage/Api/Model/Mysql4/Rules.php +4 -4
  93. app/code/core/Mage/Api/Model/Mysql4/Rules/Collection.php +4 -4
  94. app/code/core/Mage/Api/Model/Mysql4/User.php +4 -4
  95. app/code/core/Mage/Api/Model/Mysql4/User/Collection.php +4 -4
  96. app/code/core/Mage/Api/Model/Resource/Abstract.php +4 -4
  97. app/code/core/Mage/Api/Model/Resource/Acl.php +4 -4
  98. app/code/core/Mage/Api/Model/Resource/Acl/Role.php +4 -4
  99. app/code/core/Mage/Api/Model/Resource/Acl/Role/Collection.php +4 -4
  100. app/code/core/Mage/Api/Model/Resource/Permissions/Collection.php +4 -4
  101. app/code/core/Mage/Api/Model/Resource/Role.php +4 -4
  102. app/code/core/Mage/Api/Model/Resource/Role/Collection.php +4 -4
  103. app/code/core/Mage/Api/Model/Resource/Roles.php +4 -4
  104. app/code/core/Mage/Api/Model/Resource/Roles/Collection.php +4 -4
  105. app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php +4 -4
  106. app/code/core/Mage/Api/Model/Resource/Rules.php +4 -4
  107. app/code/core/Mage/Api/Model/Resource/Rules/Collection.php +4 -4
  108. app/code/core/Mage/Api/Model/Resource/User.php +4 -4
  109. app/code/core/Mage/Api/Model/Resource/User/Collection.php +4 -4
  110. app/code/core/Mage/Api/Model/Role.php +4 -4
  111. app/code/core/Mage/Api/Model/Roles.php +4 -4
  112. app/code/core/Mage/Api/Model/Rules.php +4 -4
  113. app/code/core/Mage/Api/Model/Server.php +4 -4
  114. app/code/core/Mage/Api/Model/Server/Adapter/Interface.php +4 -4
  115. app/code/core/Mage/Api/Model/Server/Adapter/Soap.php +4 -4
  116. app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php +4 -4
  117. app/code/core/Mage/Api/Model/Server/Handler.php +4 -4
  118. app/code/core/Mage/Api/Model/Server/Handler/Abstract.php +4 -4
  119. app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php +4 -4
  120. app/code/core/Mage/Api/Model/Server/V2/Handler.php +4 -4
  121. app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php +4 -4
  122. app/code/core/Mage/Api/Model/Server/Wsi/Handler.php +4 -4
  123. app/code/core/Mage/Api/Model/Session.php +4 -4
  124. app/code/core/Mage/Api/Model/User.php +4 -4
  125. app/code/core/Mage/Api/Model/Wsdl/Config.php +4 -4
  126. app/code/core/Mage/Api/Model/Wsdl/Config/Base.php +4 -4
  127. app/code/core/Mage/Api/Model/Wsdl/Config/Element.php +4 -4
  128. app/code/core/Mage/Api/controllers/IndexController.php +4 -4
  129. app/code/core/Mage/Api/controllers/SoapController.php +4 -4
  130. app/code/core/Mage/Api/controllers/V2/SoapController.php +4 -4
  131. app/code/core/Mage/Api/controllers/XmlrpcController.php +4 -4
  132. app/code/core/Mage/Api/etc/adminhtml.xml +3 -3
  133. app/code/core/Mage/Api/etc/api.xml +3 -3
  134. app/code/core/Mage/Api/etc/config.xml +3 -3
  135. app/code/core/Mage/Api/etc/system.xml +3 -3
  136. app/code/core/Mage/Api/sql/api_setup/install-1.6.0.0.php +4 -4
  137. app/code/core/Mage/Api/sql/api_setup/mysql4-install-0.7.0.php +4 -4
  138. app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.7.0-0.7.1.php +4 -4
  139. app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-0.8.0-0.8.1.php +4 -4
  140. app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +4 -4
  141. app/code/core/Mage/Api/sql/api_setup/mysql4-upgrade-1.6.0.0-1.6.0.1.php +4 -4
  142. app/code/core/Mage/Api2/Block/Adminhtml/Attribute.php +4 -4
  143. app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Buttons.php +4 -4
  144. app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit.php +4 -4
  145. app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Edit/Form.php +4 -4
  146. app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php +4 -4
  147. app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tab/Resource.php +4 -4
  148. app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Tabs.php +4 -4
  149. app/code/core/Mage/Api2/Block/Adminhtml/Permissions/User/Edit/Tab/Roles.php +4 -4
  150. app/code/core/Mage/Api2/Block/Adminhtml/Roles.php +4 -4
  151. app/code/core/Mage/Api2/Block/Adminhtml/Roles/Buttons.php +4 -4
  152. app/code/core/Mage/Api2/Block/Adminhtml/Roles/Grid.php +4 -4
  153. app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Info.php +24 -5
  154. app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Resources.php +4 -4
  155. app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tab/Users.php +4 -4
  156. app/code/core/Mage/Api2/Block/Adminhtml/Roles/Tabs.php +4 -4
  157. app/code/core/Mage/Api2/Exception.php +4 -4
  158. app/code/core/Mage/Api2/Helper/Data.php +4 -4
  159. app/code/core/Mage/Api2/Model/Acl.php +4 -4
  160. app/code/core/Mage/Api2/Model/Acl/Filter.php +4 -4
  161. app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php +4 -4
  162. app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/Operation.php +4 -4
  163. app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php +4 -4
  164. app/code/core/Mage/Api2/Model/Acl/Global.php +4 -4
  165. app/code/core/Mage/Api2/Model/Acl/Global/Role.php +4 -4
  166. app/code/core/Mage/Api2/Model/Acl/Global/Rule.php +4 -4
  167. app/code/core/Mage/Api2/Model/Acl/Global/Rule/Permission.php +4 -4
  168. app/code/core/Mage/Api2/Model/Acl/Global/Rule/Privilege.php +4 -4
  169. app/code/core/Mage/Api2/Model/Acl/Global/Rule/ResourcePermission.php +4 -4
  170. app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php +4 -4
  171. app/code/core/Mage/Api2/Model/Acl/PermissionInterface.php +4 -4
  172. app/code/core/Mage/Api2/Model/Auth.php +4 -4
  173. app/code/core/Mage/Api2/Model/Auth/Adapter.php +4 -4
  174. app/code/core/Mage/Api2/Model/Auth/Adapter/Abstract.php +4 -4
  175. app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php +4 -4
  176. app/code/core/Mage/Api2/Model/Auth/User.php +4 -4
  177. app/code/core/Mage/Api2/Model/Auth/User/Abstract.php +4 -4
  178. app/code/core/Mage/Api2/Model/Auth/User/Admin.php +4 -4
  179. app/code/core/Mage/Api2/Model/Auth/User/Customer.php +4 -4
  180. app/code/core/Mage/Api2/Model/Auth/User/Guest.php +4 -4
  181. app/code/core/Mage/Api2/Model/Config.php +4 -4
  182. app/code/core/Mage/Api2/Model/Dispatcher.php +4 -4
  183. app/code/core/Mage/Api2/Model/Multicall.php +4 -4
  184. app/code/core/Mage/Api2/Model/Observer.php +4 -4
  185. app/code/core/Mage/Api2/Model/Renderer.php +4 -4
  186. app/code/core/Mage/Api2/Model/Renderer/Interface.php +4 -4
  187. app/code/core/Mage/Api2/Model/Renderer/Json.php +4 -4
  188. app/code/core/Mage/Api2/Model/Renderer/Query.php +4 -4
  189. app/code/core/Mage/Api2/Model/Renderer/Xml.php +4 -4
  190. app/code/core/Mage/Api2/Model/Renderer/Xml/Writer.php +4 -4
  191. app/code/core/Mage/Api2/Model/Request.php +4 -4
  192. app/code/core/Mage/Api2/Model/Request/Internal.php +4 -4
  193. app/code/core/Mage/Api2/Model/Request/Interpreter.php +4 -4
  194. app/code/core/Mage/Api2/Model/Request/Interpreter/Interface.php +4 -4
  195. app/code/core/Mage/Api2/Model/Request/Interpreter/Json.php +4 -4
  196. app/code/core/Mage/Api2/Model/Request/Interpreter/Query.php +4 -4
  197. app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.php +4 -4
  198. app/code/core/Mage/Api2/Model/Resource.php +4 -4
  199. app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php +4 -4
  200. app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php +4 -4
  201. app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php +4 -4
  202. app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php +4 -4
  203. app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule.php +4 -4
  204. app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php +4 -4
  205. app/code/core/Mage/Api2/Model/Resource/Setup.php +4 -4
  206. app/code/core/Mage/Api2/Model/Resource/Validator.php +4 -4
  207. app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php +4 -4
  208. app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php +4 -4
  209. app/code/core/Mage/Api2/Model/Response.php +4 -4
  210. app/code/core/Mage/Api2/Model/Route/Abstract.php +4 -4
  211. app/code/core/Mage/Api2/Model/Route/ApiType.php +4 -4
  212. app/code/core/Mage/Api2/Model/Route/Interface.php +4 -4
  213. app/code/core/Mage/Api2/Model/Route/Rest.php +4 -4
  214. app/code/core/Mage/Api2/Model/Router.php +4 -4
  215. app/code/core/Mage/Api2/Model/Server.php +4 -4
  216. app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php +4 -4
  217. app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php +21 -4
  218. app/code/core/Mage/Api2/etc/adminhtml.xml +3 -3
  219. app/code/core/Mage/Api2/etc/config.xml +3 -3
  220. app/code/core/Mage/Api2/sql/api2_setup/install-1.0.0.0.php +4 -4
  221. app/code/core/Mage/Authorizenet/Block/Directpost/Form.php +4 -4
  222. app/code/core/Mage/Authorizenet/Block/Directpost/Iframe.php +4 -4
  223. app/code/core/Mage/Authorizenet/Helper/Data.php +4 -4
  224. app/code/core/Mage/Authorizenet/Model/Directpost.php +7 -5
  225. app/code/core/Mage/Authorizenet/Model/Directpost/Observer.php +4 -4
  226. app/code/core/Mage/Authorizenet/Model/Directpost/Request.php +4 -4
  227. app/code/core/Mage/Authorizenet/Model/Directpost/Response.php +4 -4
  228. app/code/core/Mage/Authorizenet/Model/Directpost/Session.php +4 -4
  229. app/code/core/Mage/Authorizenet/controllers/Adminhtml/Authorizenet/Directpost/PaymentController.php +4 -4
  230. app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php +4 -4
  231. app/code/core/Mage/Authorizenet/etc/config.xml +3 -3
  232. app/code/core/Mage/Authorizenet/etc/system.xml +3 -3
  233. app/code/core/Mage/Backup/Exception.php +4 -4
  234. app/code/core/Mage/Backup/Helper/Data.php +4 -4
  235. app/code/core/Mage/Backup/Model/Backup.php +4 -4
  236. app/code/core/Mage/Backup/Model/Config/Backend/Cron.php +4 -4
  237. app/code/core/Mage/Backup/Model/Config/Source/Type.php +4 -4
  238. app/code/core/Mage/Backup/Model/Db.php +4 -4
  239. app/code/core/Mage/Backup/Model/Fs/Collection.php +4 -4
  240. app/code/core/Mage/Backup/Model/Mysql4/Db.php +4 -4
  241. app/code/core/Mage/Backup/Model/Observer.php +4 -4
  242. app/code/core/Mage/Backup/Model/Resource/Db.php +4 -4
  243. app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php +4 -4
  244. app/code/core/Mage/Backup/etc/adminhtml.xml +3 -3
  245. app/code/core/Mage/Backup/etc/config.xml +3 -3
  246. app/code/core/Mage/Backup/etc/system.xml +3 -3
  247. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Bundle.php +4 -4
  248. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php +4 -4
  249. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php +4 -4
  250. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php +4 -4
  251. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php +4 -4
  252. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php +4 -4
  253. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php +4 -4
  254. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php +4 -4
  255. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php +4 -4
  256. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php +4 -4
  257. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search.php +4 -4
  258. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php +4 -4
  259. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php +4 -4
  260. app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php +4 -4
  261. app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php +4 -4
  262. app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php +4 -4
  263. app/code/core/Mage/Bundle/Block/Catalog/Product/List/Partof.php +4 -4
  264. app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php +4 -4
  265. app/code/core/Mage/Bundle/Block/Catalog/Product/View.php +4 -4
  266. app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle.php +4 -4
  267. app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php +4 -4
  268. app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php +4 -4
  269. app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php +4 -4
  270. app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php +4 -4
  271. app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php +4 -4
  272. app/code/core/Mage/Bundle/Block/Checkout/Cart/Item/Renderer.php +4 -4
  273. app/code/core/Mage/Bundle/Block/Sales/Order/Items/Renderer.php +4 -4
  274. app/code/core/Mage/Bundle/Helper/Catalog/Product/Configuration.php +4 -4
  275. app/code/core/Mage/Bundle/Helper/Data.php +4 -4
  276. app/code/core/Mage/Bundle/Model/CatalogIndex/Data/Bundle.php +4 -4
  277. app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php +4 -4
  278. app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Price.php +4 -4
  279. app/code/core/Mage/Bundle/Model/Mysql4/Indexer/Stock.php +4 -4
  280. app/code/core/Mage/Bundle/Model/Mysql4/Option.php +4 -4
  281. app/code/core/Mage/Bundle/Model/Mysql4/Option/Collection.php +4 -4
  282. app/code/core/Mage/Bundle/Model/Mysql4/Price/Index.php +4 -4
  283. app/code/core/Mage/Bundle/Model/Mysql4/Selection.php +4 -4
  284. app/code/core/Mage/Bundle/Model/Mysql4/Selection/Collection.php +4 -4
  285. app/code/core/Mage/Bundle/Model/Observer.php +4 -4
  286. app/code/core/Mage/Bundle/Model/Option.php +4 -4
  287. app/code/core/Mage/Bundle/Model/Price/Index.php +4 -4
  288. app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php +4 -4
  289. app/code/core/Mage/Bundle/Model/Product/Price.php +9 -6
  290. app/code/core/Mage/Bundle/Model/Product/Type.php +7 -7
  291. app/code/core/Mage/Bundle/Model/Resource/Bundle.php +4 -4
  292. app/code/core/Mage/Bundle/Model/Resource/Indexer/Price.php +4 -4
  293. app/code/core/Mage/Bundle/Model/Resource/Indexer/Stock.php +4 -4
  294. app/code/core/Mage/Bundle/Model/Resource/Option.php +4 -4
  295. app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php +4 -4
  296. app/code/core/Mage/Bundle/Model/Resource/Price/Index.php +4 -4
  297. app/code/core/Mage/Bundle/Model/Resource/Selection.php +4 -4
  298. app/code/core/Mage/Bundle/Model/Resource/Selection/Collection.php +4 -4
  299. app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php +4 -4
  300. app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php +4 -4
  301. app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php +4 -4
  302. app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php +4 -4
  303. app/code/core/Mage/Bundle/Model/Selection.php +4 -4
  304. app/code/core/Mage/Bundle/Model/Source/Option/Selection/Price/Type.php +4 -4
  305. app/code/core/Mage/Bundle/Model/Source/Option/Type.php +4 -4
  306. app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/Product/EditController.php +4 -4
  307. app/code/core/Mage/Bundle/controllers/Adminhtml/Bundle/SelectionController.php +4 -4
  308. app/code/core/Mage/Bundle/controllers/Product/EditController.php +4 -4
  309. app/code/core/Mage/Bundle/controllers/SelectionController.php +4 -4
  310. app/code/core/Mage/Bundle/data/bundle_setup/data-install-1.6.0.0.php +4 -4
  311. app/code/core/Mage/Bundle/etc/config.xml +3 -3
  312. app/code/core/Mage/Bundle/sql/bundle_setup/install-1.6.0.0.php +4 -4
  313. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-data-upgrade-0.1.13-0.1.14.php +4 -4
  314. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-install-0.1.0.php +4 -4
  315. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.0-0.1.1.php +4 -4
  316. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.1-0.1.2.php +4 -4
  317. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.10-0.1.11.php +4 -4
  318. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.11-0.1.12.php +4 -4
  319. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.12-0.1.13.php +4 -4
  320. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.2-0.1.3.php +4 -4
  321. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.3-0.1.4.php +4 -4
  322. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.4-0.1.5.php +4 -4
  323. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.5-0.1.6.php +4 -4
  324. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.6-0.1.7.php +4 -4
  325. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.7-0.1.8.php +4 -4
  326. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.8-0.1.9.php +4 -4
  327. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-0.1.9-0.1.10.php +4 -4
  328. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +4 -4
  329. app/code/core/Mage/Bundle/sql/bundle_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php +4 -4
  330. app/code/core/Mage/Bundle/sql/bundle_setup/upgrade-1.6.0.0-1.6.0.0.1.php +4 -4
  331. app/code/core/Mage/Captcha/Block/Captcha.php +4 -4
  332. app/code/core/Mage/Captcha/Block/Captcha/Zend.php +4 -4
  333. app/code/core/Mage/Captcha/Helper/Data.php +4 -4
  334. app/code/core/Mage/Captcha/Model/Config/Font.php +4 -4
  335. app/code/core/Mage/Captcha/Model/Config/Form/Abstract.php +4 -4
  336. app/code/core/Mage/Captcha/Model/Config/Form/Backend.php +4 -4
  337. app/code/core/Mage/Captcha/Model/Config/Form/Frontend.php +4 -4
  338. app/code/core/Mage/Captcha/Model/Config/Mode.php +4 -4
  339. app/code/core/Mage/Captcha/Model/Interface.php +4 -4
  340. app/code/core/Mage/Captcha/Model/Observer.php +5 -5
  341. app/code/core/Mage/Captcha/Model/Resource/Log.php +4 -4
  342. app/code/core/Mage/Captcha/Model/Zend.php +4 -4
  343. app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php +4 -4
  344. app/code/core/Mage/Captcha/controllers/RefreshController.php +4 -4
  345. app/code/core/Mage/Captcha/etc/config.xml +3 -3
  346. app/code/core/Mage/Captcha/etc/system.xml +3 -3
  347. app/code/core/Mage/Captcha/sql/captcha_setup/install-1.7.0.0.0.php +4 -4
  348. app/code/core/Mage/Catalog/Block/Breadcrumbs.php +4 -4
  349. app/code/core/Mage/Catalog/Block/Category/View.php +4 -4
  350. app/code/core/Mage/Catalog/Block/Category/Widget/Link.php +4 -4
  351. app/code/core/Mage/Catalog/Block/Layer/Filter/Abstract.php +4 -4
  352. app/code/core/Mage/Catalog/Block/Layer/Filter/Attribute.php +4 -4
  353. app/code/core/Mage/Catalog/Block/Layer/Filter/Category.php +4 -4
  354. app/code/core/Mage/Catalog/Block/Layer/Filter/Decimal.php +4 -4
  355. app/code/core/Mage/Catalog/Block/Layer/Filter/Price.php +4 -4
  356. app/code/core/Mage/Catalog/Block/Layer/State.php +4 -4
  357. app/code/core/Mage/Catalog/Block/Layer/View.php +4 -4
  358. app/code/core/Mage/Catalog/Block/Navigation.php +4 -4
  359. app/code/core/Mage/Catalog/Block/Product.php +4 -4
  360. app/code/core/Mage/Catalog/Block/Product/Abstract.php +4 -4
  361. app/code/core/Mage/Catalog/Block/Product/Compare/Abstract.php +4 -4
  362. app/code/core/Mage/Catalog/Block/Product/Compare/List.php +4 -4
  363. app/code/core/Mage/Catalog/Block/Product/Compare/Sidebar.php +4 -4
  364. app/code/core/Mage/Catalog/Block/Product/Gallery.php +4 -4
  365. app/code/core/Mage/Catalog/Block/Product/List.php +4 -4
  366. app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php +4 -4
  367. app/code/core/Mage/Catalog/Block/Product/List/Promotion.php +4 -4
  368. app/code/core/Mage/Catalog/Block/Product/List/Random.php +4 -4
  369. app/code/core/Mage/Catalog/Block/Product/List/Related.php +4 -4
  370. app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php +4 -4
  371. app/code/core/Mage/Catalog/Block/Product/List/Upsell.php +4 -4
  372. app/code/core/Mage/Catalog/Block/Product/New.php +4 -4
  373. app/code/core/Mage/Catalog/Block/Product/Price.php +4 -4
  374. app/code/core/Mage/Catalog/Block/Product/Price/Template.php +4 -4
  375. app/code/core/Mage/Catalog/Block/Product/Send.php +4 -4
  376. app/code/core/Mage/Catalog/Block/Product/View.php +4 -4
  377. app/code/core/Mage/Catalog/Block/Product/View/Abstract.php +4 -4
  378. app/code/core/Mage/Catalog/Block/Product/View/Additional.php +4 -4
  379. app/code/core/Mage/Catalog/Block/Product/View/Attributes.php +4 -4
  380. app/code/core/Mage/Catalog/Block/Product/View/Description.php +4 -4
  381. app/code/core/Mage/Catalog/Block/Product/View/Media.php +40 -4
  382. app/code/core/Mage/Catalog/Block/Product/View/Options.php +4 -4
  383. app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php +4 -4
  384. app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Date.php +4 -4
  385. app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Default.php +4 -4
  386. app/code/core/Mage/Catalog/Block/Product/View/Options/Type/File.php +4 -4
  387. app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Select.php +4 -4
  388. app/code/core/Mage/Catalog/Block/Product/View/Options/Type/Text.php +4 -4
  389. app/code/core/Mage/Catalog/Block/Product/View/Price.php +4 -4
  390. app/code/core/Mage/Catalog/Block/Product/View/Tabs.php +4 -4
  391. app/code/core/Mage/Catalog/Block/Product/View/Type/Configurable.php +4 -4
  392. app/code/core/Mage/Catalog/Block/Product/View/Type/Grouped.php +4 -4
  393. app/code/core/Mage/Catalog/Block/Product/View/Type/Simple.php +4 -4
  394. app/code/core/Mage/Catalog/Block/Product/View/Type/Virtual.php +4 -4
  395. app/code/core/Mage/Catalog/Block/Product/Widget/Html/Pager.php +4 -4
  396. app/code/core/Mage/Catalog/Block/Product/Widget/Link.php +4 -4
  397. app/code/core/Mage/Catalog/Block/Product/Widget/New.php +11 -4
  398. app/code/core/Mage/Catalog/Block/Seo/Sitemap/Abstract.php +4 -4
  399. app/code/core/Mage/Catalog/Block/Seo/Sitemap/Category.php +4 -4
  400. app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php +4 -4
  401. app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Category.php +4 -4
  402. app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php +4 -4
  403. app/code/core/Mage/Catalog/Block/Widget/Link.php +42 -23
  404. app/code/core/Mage/Catalog/Exception.php +4 -4
  405. app/code/core/Mage/Catalog/Helper/Category.php +4 -4
  406. app/code/core/Mage/Catalog/Helper/Category/Flat.php +4 -4
  407. app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite.php +4 -4
  408. app/code/core/Mage/Catalog/Helper/Category/Url/Rewrite/Interface.php +4 -4
  409. app/code/core/Mage/Catalog/Helper/Data.php +4 -4
  410. app/code/core/Mage/Catalog/Helper/Flat/Abstract.php +27 -6
  411. app/code/core/Mage/Catalog/Helper/Image.php +7 -4
  412. app/code/core/Mage/Catalog/Helper/Map.php +4 -4
  413. app/code/core/Mage/Catalog/Helper/Output.php +4 -4
  414. app/code/core/Mage/Catalog/Helper/Product.php +21 -4
  415. app/code/core/Mage/Catalog/Helper/Product/Compare.php +4 -4
  416. app/code/core/Mage/Catalog/Helper/Product/Configuration.php +4 -4
  417. app/code/core/Mage/Catalog/Helper/Product/Configuration/Interface.php +4 -4
  418. app/code/core/Mage/Catalog/Helper/Product/Flat.php +4 -4
  419. app/code/core/Mage/Catalog/Helper/Product/Options.php +4 -4
  420. app/code/core/Mage/Catalog/Helper/Product/Url.php +4 -4
  421. app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite.php +4 -4
  422. app/code/core/Mage/Catalog/Helper/Product/Url/Rewrite/Interface.php +4 -4
  423. app/code/core/Mage/Catalog/Helper/Product/View.php +4 -4
  424. app/code/core/Mage/Catalog/Model/Abstract.php +4 -4
  425. app/code/core/Mage/Catalog/Model/Api/Resource.php +4 -4
  426. app/code/core/Mage/Catalog/Model/Api2/Product.php +4 -4
  427. app/code/core/Mage/Catalog/Model/Api2/Product/Category.php +4 -4
  428. app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest.php +4 -4
  429. app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Admin/V1.php +4 -4
  430. app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Customer/V1.php +4 -4
  431. app/code/core/Mage/Catalog/Model/Api2/Product/Category/Rest/Guest/V1.php +4 -4
  432. app/code/core/Mage/Catalog/Model/Api2/Product/Image.php +4 -4
  433. app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest.php +4 -4
  434. app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php +4 -4
  435. app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Customer/V1.php +4 -4
  436. app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Guest/V1.php +4 -4
  437. app/code/core/Mage/Catalog/Model/Api2/Product/Image/Validator/Image.php +4 -4
  438. app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php +4 -4
  439. app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Admin/V1.php +4 -4
  440. app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Customer/V1.php +4 -4
  441. app/code/core/Mage/Catalog/Model/Api2/Product/Rest/Guest/V1.php +4 -4
  442. app/code/core/Mage/Catalog/Model/Api2/Product/Validator/Product.php +4 -4
  443. app/code/core/Mage/Catalog/Model/Api2/Product/Website.php +4 -4
  444. app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest.php +4 -4
  445. app/code/core/Mage/Catalog/Model/Api2/Product/Website/Rest/Admin/V1.php +4 -4
  446. app/code/core/Mage/Catalog/Model/Api2/Product/Website/Validator/Admin/Website.php +4 -4
  447. app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php +4 -4
  448. app/code/core/Mage/Catalog/Model/Attribute/Backend/Urlkey/Abstract.php +4 -4
  449. app/code/core/Mage/Catalog/Model/Category.php +13 -11
  450. app/code/core/Mage/Catalog/Model/Category/Api.php +4 -4
  451. app/code/core/Mage/Catalog/Model/Category/Api/V2.php +4 -4
  452. app/code/core/Mage/Catalog/Model/Category/Attribute/Api.php +4 -4
  453. app/code/core/Mage/Catalog/Model/Category/Attribute/Api/V2.php +4 -4
  454. app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php +4 -4
  455. app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Sortby.php +4 -4
  456. app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Urlkey.php +4 -4
  457. app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Layout.php +4 -4
  458. app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Mode.php +4 -4
  459. app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Page.php +4 -4
  460. app/code/core/Mage/Catalog/Model/Category/Attribute/Source/Sortby.php +4 -4
  461. app/code/core/Mage/Catalog/Model/Category/Indexer/Flat.php +4 -4
  462. app/code/core/Mage/Catalog/Model/Category/Indexer/Product.php +4 -4
  463. app/code/core/Mage/Catalog/Model/Category/Url.php +4 -4
  464. app/code/core/Mage/Catalog/Model/Config.php +4 -4
  465. app/code/core/Mage/Catalog/Model/Convert.php +4 -4
  466. app/code/core/Mage/Catalog/Model/Convert/Adapter/Catalog.php +4 -4
  467. app/code/core/Mage/Catalog/Model/Convert/Adapter/Product.php +4 -4
  468. app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php +4 -4
  469. app/code/core/Mage/Catalog/Model/Design.php +4 -4
  470. app/code/core/Mage/Catalog/Model/Entity/Attribute.php +4 -4
  471. app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php +4 -4
  472. app/code/core/Mage/Catalog/Model/Entity/Product/Attribute/Frontend/Image.php +4 -4
  473. app/code/core/Mage/Catalog/Model/Factory.php +4 -4
  474. app/code/core/Mage/Catalog/Model/Index.php +4 -4
  475. app/code/core/Mage/Catalog/Model/Indexer/Url.php +4 -4
  476. app/code/core/Mage/Catalog/Model/Layer.php +4 -4
  477. app/code/core/Mage/Catalog/Model/Layer/Filter/Abstract.php +4 -4
  478. app/code/core/Mage/Catalog/Model/Layer/Filter/Attribute.php +4 -4
  479. app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php +4 -4
  480. app/code/core/Mage/Catalog/Model/Layer/Filter/Decimal.php +4 -4
  481. app/code/core/Mage/Catalog/Model/Layer/Filter/Item.php +4 -4
  482. app/code/core/Mage/Catalog/Model/Layer/Filter/Price.php +4 -4
  483. app/code/core/Mage/Catalog/Model/Layer/Filter/Price/Algorithm.php +4 -4
  484. app/code/core/Mage/Catalog/Model/Layer/State.php +4 -4
  485. app/code/core/Mage/Catalog/Model/Observer.php +4 -4
  486. app/code/core/Mage/Catalog/Model/Product.php +27 -16
  487. app/code/core/Mage/Catalog/Model/Product/Action.php +4 -4
  488. app/code/core/Mage/Catalog/Model/Product/Api.php +4 -4
  489. app/code/core/Mage/Catalog/Model/Product/Api/V2.php +4 -4
  490. app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php +4 -4
  491. app/code/core/Mage/Catalog/Model/Product/Attribute/Api/V2.php +4 -4
  492. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Boolean.php +4 -4
  493. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice.php +4 -4
  494. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Groupprice/Abstract.php +4 -4
  495. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php +4 -4
  496. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Msrp.php +4 -4
  497. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Price.php +4 -4
  498. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Recurring.php +4 -4
  499. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.php +4 -4
  500. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate.php +4 -4
  501. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Startdate/Specialprice.php +4 -4
  502. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Tierprice.php +4 -4
  503. app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Urlkey.php +4 -4
  504. app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php +4 -4
  505. app/code/core/Mage/Catalog/Model/Product/Attribute/Group.php +4 -4
  506. app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php +4 -4
  507. app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php +4 -4
  508. app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api.php +4 -4
  509. app/code/core/Mage/Catalog/Model/Product/Attribute/Set/Api/V2.php +4 -4
  510. app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Boolean.php +4 -4
  511. app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php +4 -4
  512. app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Inputtype.php +4 -4
  513. app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Layout.php +4 -4
  514. app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type.php +4 -4
  515. app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Enabled.php +4 -4
  516. app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Msrp/Type/Price.php +4 -4
  517. app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php +4 -4
  518. app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php +4 -4
  519. app/code/core/Mage/Catalog/Model/Product/Compare/Item.php +4 -4
  520. app/code/core/Mage/Catalog/Model/Product/Compare/List.php +4 -4
  521. app/code/core/Mage/Catalog/Model/Product/Condition.php +4 -4
  522. app/code/core/Mage/Catalog/Model/Product/Condition/Interface.php +4 -4
  523. app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Interface.php +4 -4
  524. app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option.php +4 -4
  525. app/code/core/Mage/Catalog/Model/Product/Configuration/Item/Option/Interface.php +4 -4
  526. app/code/core/Mage/Catalog/Model/Product/Flat/Flag.php +4 -4
  527. app/code/core/Mage/Catalog/Model/Product/Flat/Indexer.php +4 -4
  528. app/code/core/Mage/Catalog/Model/Product/Flat/Observer.php +4 -4
  529. app/code/core/Mage/Catalog/Model/Product/Image.php +4 -4
  530. app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php +4 -4
  531. app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php +4 -4
  532. app/code/core/Mage/Catalog/Model/Product/Indexer/Price.php +4 -4
  533. app/code/core/Mage/Catalog/Model/Product/Link.php +4 -4
  534. app/code/core/Mage/Catalog/Model/Product/Link/Api.php +4 -4
  535. app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php +4 -4
  536. app/code/core/Mage/Catalog/Model/Product/Media/Config.php +4 -4
  537. app/code/core/Mage/Catalog/Model/Product/Option.php +4 -4
  538. app/code/core/Mage/Catalog/Model/Product/Option/Api.php +4 -4
  539. app/code/core/Mage/Catalog/Model/Product/Option/Api/V2.php +4 -4
  540. app/code/core/Mage/Catalog/Model/Product/Option/Observer.php +4 -4
  541. app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php +4 -4
  542. app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php +4 -4
  543. app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php +4 -4
  544. app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php +4 -4
  545. app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php +4 -4
  546. app/code/core/Mage/Catalog/Model/Product/Option/Value.php +4 -4
  547. app/code/core/Mage/Catalog/Model/Product/Option/Value/Api.php +4 -4
  548. app/code/core/Mage/Catalog/Model/Product/Option/Value/Api/V2.php +4 -4
  549. app/code/core/Mage/Catalog/Model/Product/Status.php +4 -4
  550. app/code/core/Mage/Catalog/Model/Product/Type.php +4 -4
  551. app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php +4 -4
  552. app/code/core/Mage/Catalog/Model/Product/Type/Api.php +4 -4
  553. app/code/core/Mage/Catalog/Model/Product/Type/Api/V2.php +4 -4
  554. app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php +22 -5
  555. app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Attribute.php +4 -4
  556. app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php +4 -4
  557. app/code/core/Mage/Catalog/Model/Product/Type/Grouped.php +4 -4
  558. app/code/core/Mage/Catalog/Model/Product/Type/Grouped/Price.php +4 -4
  559. app/code/core/Mage/Catalog/Model/Product/Type/Price.php +4 -4
  560. app/code/core/Mage/Catalog/Model/Product/Type/Simple.php +4 -4
  561. app/code/core/Mage/Catalog/Model/Product/Type/Virtual.php +4 -4
  562. app/code/core/Mage/Catalog/Model/Product/Url.php +4 -4
  563. app/code/core/Mage/Catalog/Model/Product/Visibility.php +4 -4
  564. app/code/core/Mage/Catalog/Model/Product/Website.php +4 -4
  565. app/code/core/Mage/Catalog/Model/Resource/Abstract.php +4 -4
  566. app/code/core/Mage/Catalog/Model/Resource/Attribute.php +4 -4
  567. app/code/core/Mage/Catalog/Model/Resource/Category.php +4 -4
  568. app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Collection.php +4 -4
  569. app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php +4 -4
  570. app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Layout.php +4 -4
  571. app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Mode.php +4 -4
  572. app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Source/Page.php +4 -4
  573. app/code/core/Mage/Catalog/Model/Resource/Category/Collection.php +4 -4
  574. app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php +4 -4
  575. app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php +12 -4
  576. app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php +4 -4
  577. app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php +6 -6
  578. app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php +4 -4
  579. app/code/core/Mage/Catalog/Model/Resource/Config.php +4 -4
  580. app/code/core/Mage/Catalog/Model/Resource/Eav/Attribute.php +20 -7
  581. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Abstract.php +4 -4
  582. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Attribute.php +4 -4
  583. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category.php +4 -4
  584. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Collection.php +4 -4
  585. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Frontend/Image.php +4 -4
  586. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Layout.php +4 -4
  587. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Mode.php +4 -4
  588. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Attribute/Source/Page.php +4 -4
  589. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Collection.php +4 -4
  590. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat.php +4 -4
  591. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Flat/Collection.php +4 -4
  592. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Indexer/Product.php +4 -4
  593. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Category/Tree.php +4 -4
  594. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Collection/Abstract.php +4 -4
  595. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Config.php +4 -4
  596. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Attribute.php +4 -4
  597. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Decimal.php +4 -4
  598. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Layer/Filter/Price.php +4 -4
  599. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product.php +4 -4
  600. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Action.php +4 -4
  601. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Image.php +4 -4
  602. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Media.php +4 -4
  603. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Tierprice.php +4 -4
  604. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Backend/Urlkey.php +4 -4
  605. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Collection.php +4 -4
  606. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Image.php +4 -4
  607. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Attribute/Frontend/Tierprice.php +4 -4
  608. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Collection.php +4 -4
  609. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item.php +4 -4
  610. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Compare/Item/Collection.php +4 -4
  611. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat.php +4 -4
  612. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Flat/Indexer.php +4 -4
  613. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Abstract.php +4 -4
  614. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav.php +4 -4
  615. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Abstract.php +4 -4
  616. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Decimal.php +4 -4
  617. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Eav/Source.php +4 -4
  618. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price.php +4 -4
  619. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Configurable.php +4 -4
  620. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Default.php +4 -4
  621. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Grouped.php +4 -4
  622. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Indexer/Price/Interface.php +4 -4
  623. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link.php +4 -4
  624. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Collection.php +4 -4
  625. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Link/Product/Collection.php +4 -4
  626. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option.php +4 -4
  627. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Collection.php +4 -4
  628. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value.php +4 -4
  629. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Option/Value/Collection.php +4 -4
  630. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Relation.php +4 -4
  631. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Status.php +4 -4
  632. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable.php +4 -4
  633. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute.php +4 -4
  634. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Attribute/Collection.php +4 -4
  635. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Type/Configurable/Product/Collection.php +4 -4
  636. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Product/Website.php +4 -4
  637. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend.php +4 -4
  638. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Sendfriend/Collection.php +4 -4
  639. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Setup.php +4 -4
  640. app/code/core/Mage/Catalog/Model/Resource/Eav/Mysql4/Url.php +4 -4
  641. app/code/core/Mage/Catalog/Model/Resource/Helper/Mysql4.php +4 -4
  642. app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Attribute.php +4 -4
  643. app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Decimal.php +4 -4
  644. app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php +6 -5
  645. app/code/core/Mage/Catalog/Model/Resource/Product.php +4 -4
  646. app/code/core/Mage/Catalog/Model/Resource/Product/Action.php +4 -4
  647. app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice.php +4 -4
  648. app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Groupprice/Abstract.php +4 -4
  649. app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Image.php +4 -4
  650. app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php +98 -30
  651. app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Tierprice.php +4 -4
  652. app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php +4 -4
  653. app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Collection.php +4 -4
  654. app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Image.php +4 -4
  655. app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Frontend/Tierprice.php +4 -4
  656. app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php +6 -4
  657. app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php +4 -4
  658. app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item/Collection.php +4 -4
  659. app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php +4 -4
  660. app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php +4 -4
  661. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Abstract.php +4 -4
  662. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav.php +4 -4
  663. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Abstract.php +4 -4
  664. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php +4 -4
  665. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php +4 -4
  666. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php +4 -4
  667. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Configurable.php +4 -4
  668. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Default.php +4 -4
  669. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Grouped.php +4 -4
  670. app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price/Interface.php +4 -4
  671. app/code/core/Mage/Catalog/Model/Resource/Product/Link.php +4 -4
  672. app/code/core/Mage/Catalog/Model/Resource/Product/Link/Collection.php +4 -4
  673. app/code/core/Mage/Catalog/Model/Resource/Product/Link/Product/Collection.php +4 -4
  674. app/code/core/Mage/Catalog/Model/Resource/Product/Option.php +4 -4
  675. app/code/core/Mage/Catalog/Model/Resource/Product/Option/Collection.php +4 -4
  676. app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value.php +4 -4
  677. app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value/Collection.php +4 -4
  678. app/code/core/Mage/Catalog/Model/Resource/Product/Relation.php +4 -4
  679. app/code/core/Mage/Catalog/Model/Resource/Product/Status.php +4 -4
  680. app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable.php +4 -4
  681. app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute.php +4 -4
  682. app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php +42 -32
  683. app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Product/Collection.php +4 -4
  684. app/code/core/Mage/Catalog/Model/Resource/Product/Website.php +4 -4
  685. app/code/core/Mage/Catalog/Model/Resource/Setup.php +4 -4
  686. app/code/core/Mage/Catalog/Model/Resource/Url.php +4 -4
  687. app/code/core/Mage/Catalog/Model/Session.php +4 -4
  688. app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Category/Flat.php +4 -4
  689. app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Product/Flat.php +4 -4
  690. app/code/core/Mage/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php +4 -4
  691. app/code/core/Mage/Catalog/Model/Template/Filter.php +4 -4
  692. app/code/core/Mage/Catalog/Model/Url.php +4 -4
  693. app/code/core/Mage/Catalog/controllers/CategoryController.php +4 -4
  694. app/code/core/Mage/Catalog/controllers/IndexController.php +4 -4
  695. app/code/core/Mage/Catalog/controllers/Product/CompareController.php +5 -5
  696. app/code/core/Mage/Catalog/controllers/ProductController.php +4 -4
  697. app/code/core/Mage/Catalog/controllers/Seo/SitemapController.php +4 -4
  698. app/code/core/Mage/Catalog/data/catalog_setup/data-install-1.6.0.0.php +4 -4
  699. app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.12-1.6.0.0.13.php +4 -4
  700. app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.13-1.6.0.0.14.php +4 -4
  701. app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.4-1.6.0.0.5.php +4 -4
  702. app/code/core/Mage/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.8-1.6.0.0.9.php +4 -4
  703. app/code/core/Mage/Catalog/etc/adminhtml.xml +3 -3
  704. app/code/core/Mage/Catalog/etc/api.xml +3 -3
  705. app/code/core/Mage/Catalog/etc/api2.xml +3 -3
  706. app/code/core/Mage/Catalog/etc/config.xml +7 -3
  707. app/code/core/Mage/Catalog/etc/convert.xml +3 -3
  708. app/code/core/Mage/Catalog/etc/system.xml +30 -3
  709. app/code/core/Mage/Catalog/etc/widget.xml +3 -3
  710. app/code/core/Mage/Catalog/sql/catalog_setup/install-1.6.0.0.php +4 -4
  711. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.57-0.7.58.php +4 -4
  712. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-0.7.63-0.7.64.php +4 -4
  713. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.28-1.4.0.0.29.php +4 -4
  714. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-data-upgrade-1.4.0.0.42-1.4.0.0.43.php +4 -4
  715. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-0.7.0.php +4 -4
  716. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-install-1.4.0.0.0.php +4 -4
  717. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.6.40-0.7.0.php +4 -4
  718. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.0-0.7.1.php +4 -4
  719. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.1-0.7.2.php +4 -4
  720. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.11-0.7.12.php +4 -4
  721. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.12-0.7.13.php +4 -4
  722. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.13-0.7.14.php +4 -4
  723. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.14-0.7.15.php +4 -4
  724. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.15-0.7.16.php +4 -4
  725. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.16-0.7.17.php +4 -4
  726. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.17-0.7.18.php +4 -4
  727. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.18-0.7.19.php +4 -4
  728. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.19-0.7.20.php +4 -4
  729. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.2-0.7.3.php +4 -4
  730. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.20-0.7.21.php +4 -4
  731. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.21-0.7.22.php +4 -4
  732. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.22-0.7.23.php +4 -4
  733. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.23-0.7.24.php +4 -4
  734. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.24-0.7.25.php +4 -4
  735. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.25-0.7.26.php +4 -4
  736. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.26-0.7.27.php +4 -4
  737. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.27-0.7.28.php +4 -4
  738. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.28-0.7.29.php +4 -4
  739. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.29-0.7.30.php +4 -4
  740. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.30-0.7.31.php +4 -4
  741. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.31-0.7.32.php +4 -4
  742. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.32-0.7.33.php +4 -4
  743. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.33-0.7.34.php +4 -4
  744. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.34-0.7.35.php +4 -4
  745. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.35-0.7.36.php +4 -4
  746. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.36-0.7.37.php +4 -4
  747. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.37-0.7.38.php +4 -4
  748. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.38-0.7.39.php +4 -4
  749. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.39-0.7.40.php +4 -4
  750. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.4-0.7.5.php +4 -4
  751. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.40-0.7.41.php +4 -4
  752. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.41-0.7.42.php +4 -4
  753. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.43-0.7.44.php +4 -4
  754. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.44-0.7.45.php +4 -4
  755. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.45-0.7.46.php +4 -4
  756. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.46-0.7.47.php +4 -4
  757. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.47-0.7.48.php +4 -4
  758. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.48-0.7.49.php +4 -4
  759. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.49-0.7.50.php +4 -4
  760. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.5-0.7.6.php +4 -4
  761. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.50-0.7.51.php +4 -4
  762. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.51-0.7.52.php +4 -4
  763. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.52-0.7.53.php +4 -4
  764. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.53-0.7.54.php +4 -4
  765. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.54-0.7.55.php +4 -4
  766. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.55-0.7.56.php +4 -4
  767. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.56-0.7.57.php +4 -4
  768. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.57-0.7.58.php +4 -4
  769. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.58-0.7.59.php +4 -4
  770. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.59-0.7.60.php +4 -4
  771. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.6-0.7.7.php +4 -4
  772. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.60-0.7.61.php +4 -4
  773. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.61-0.7.62.php +4 -4
  774. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.62-0.7.63.php +4 -4
  775. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.63-0.7.64.php +4 -4
  776. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.64-0.7.65.php +4 -4
  777. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.65-0.7.66.php +4 -4
  778. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.66-0.7.67.php +4 -4
  779. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.67-0.7.68.php +4 -4
  780. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.68-0.7.69.php +4 -4
  781. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.69-0.7.70.php +4 -4
  782. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.7-0.7.8.php +4 -4
  783. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.70-0.7.71.php +4 -4
  784. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.71-0.7.72.php +4 -4
  785. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.72-0.7.73.php +4 -4
  786. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.73-1.4.0.0.0.php +4 -4
  787. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-0.7.8-0.7.9.php +4 -4
  788. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.0-1.4.0.0.1.php +4 -4
  789. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.1-1.4.0.0.2.php +4 -4
  790. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.10-1.4.0.0.11.php +4 -4
  791. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.11-1.4.0.0.12.php +4 -4
  792. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.12-1.4.0.0.13.php +4 -4
  793. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.13-1.4.0.0.14.php +4 -4
  794. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.14-1.4.0.0.15.php +4 -4
  795. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.15-1.4.0.0.16.php +4 -4
  796. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.16-1.4.0.0.17.php +4 -4
  797. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.17-1.4.0.0.18.php +4 -4
  798. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.18-1.4.0.0.19.php +4 -4
  799. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.19-1.4.0.0.20.php +4 -4
  800. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.2-1.4.0.0.3.php +4 -4
  801. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.20-1.4.0.0.21.php +4 -4
  802. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.21-1.4.0.0.22.php +4 -4
  803. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.22-1.4.0.0.23.php +4 -4
  804. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.23-1.4.0.0.24.php +4 -4
  805. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.24-1.4.0.0.25.php +4 -4
  806. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.25-1.4.0.0.26.php +4 -4
  807. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.26-1.4.0.0.27.php +4 -4
  808. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.27-1.4.0.0.28.php +4 -4
  809. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.28-1.4.0.0.29.php +4 -4
  810. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.3-1.4.0.0.4.php +4 -4
  811. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.30-1.4.0.0.31.php +4 -4
  812. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.31-1.4.0.0.32.php +4 -4
  813. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.32-1.4.0.0.33.php +4 -4
  814. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.33-1.4.0.0.34.php +4 -4
  815. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.34-1.4.0.0.35.php +4 -4
  816. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.35-1.4.0.0.36.php +4 -4
  817. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.36-1.4.0.0.37.php +4 -4
  818. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.37-1.4.0.0.38.php +4 -4
  819. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.38-1.4.0.0.39.php +4 -4
  820. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.39-1.4.0.0.40.php +4 -4
  821. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.4-1.4.0.0.5.php +4 -4
  822. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.40-1.4.0.0.41.php +4 -4
  823. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.41-1.4.0.0.42.php +4 -4
  824. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.43-1.4.0.0.44.php +4 -4
  825. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.5-1.4.0.0.6.php +4 -4
  826. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.6-1.4.0.0.7.php +4 -4
  827. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.7-1.4.0.0.8.php +4 -4
  828. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.8-1.4.0.0.9.php +4 -4
  829. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.4.0.0.9-1.4.0.0.10.php +4 -4
  830. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +4 -4
  831. app/code/core/Mage/Catalog/sql/catalog_setup/mysql4-upgrade-1.6.0.0.8-1.6.0.0.9.php +4 -4
  832. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.php +4 -4
  833. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php +4 -4
  834. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.10-1.6.0.0.11.php +4 -4
  835. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.11-1.6.0.0.12.php +4 -4
  836. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.14-1.6.0.0.15.php +4 -4
  837. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.15-1.6.0.0.18.php +4 -4
  838. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.18-1.6.0.0.19.php +4 -4
  839. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.2-1.6.0.0.3.php +4 -4
  840. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.3-1.6.0.0.4.php +4 -4
  841. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.4-1.6.0.0.5.php +4 -4
  842. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.5-1.6.0.0.6.php +4 -4
  843. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.6-1.6.0.0.7.php +4 -4
  844. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.7-1.6.0.0.8.php +4 -4
  845. app/code/core/Mage/Catalog/sql/catalog_setup/upgrade-1.6.0.0.9-1.6.0.0.10.php +4 -4
  846. app/code/core/Mage/CatalogIndex/Model/Aggregation.php +4 -4
  847. app/code/core/Mage/CatalogIndex/Model/Attribute.php +4 -4
  848. app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Flag.php +4 -4
  849. app/code/core/Mage/CatalogIndex/Model/Catalog/Index/Kill/Flag.php +4 -4
  850. app/code/core/Mage/CatalogIndex/Model/Data/Abstract.php +4 -4
  851. app/code/core/Mage/CatalogIndex/Model/Data/Configurable.php +4 -4
  852. app/code/core/Mage/CatalogIndex/Model/Data/Grouped.php +4 -4
  853. app/code/core/Mage/CatalogIndex/Model/Data/Simple.php +4 -4
  854. app/code/core/Mage/CatalogIndex/Model/Data/Virtual.php +4 -4
  855. app/code/core/Mage/CatalogIndex/Model/Indexer.php +4 -4
  856. app/code/core/Mage/CatalogIndex/Model/Indexer/Abstract.php +4 -4
  857. app/code/core/Mage/CatalogIndex/Model/Indexer/Eav.php +4 -4
  858. app/code/core/Mage/CatalogIndex/Model/Indexer/Interface.php +4 -4
  859. app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php +4 -4
  860. app/code/core/Mage/CatalogIndex/Model/Indexer/Price.php +4 -4
  861. app/code/core/Mage/CatalogIndex/Model/Indexer/Tierprice.php +4 -4
  862. app/code/core/Mage/CatalogIndex/Model/Mysql4/Abstract.php +4 -4
  863. app/code/core/Mage/CatalogIndex/Model/Mysql4/Aggregation.php +4 -4
  864. app/code/core/Mage/CatalogIndex/Model/Mysql4/Attribute.php +4 -4
  865. app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Abstract.php +4 -4
  866. app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Configurable.php +4 -4
  867. app/code/core/Mage/CatalogIndex/Model/Mysql4/Data/Grouped.php +4 -4
  868. app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer.php +4 -4
  869. app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Abstract.php +4 -4
  870. app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Eav.php +4 -4
  871. app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Minimalprice.php +4 -4
  872. app/code/core/Mage/CatalogIndex/Model/Mysql4/Indexer/Price.php +4 -4
  873. app/code/core/Mage/CatalogIndex/Model/Mysql4/Price.php +4 -4
  874. app/code/core/Mage/CatalogIndex/Model/Mysql4/Retreiver.php +4 -4
  875. app/code/core/Mage/CatalogIndex/Model/Mysql4/Setup.php +4 -4
  876. app/code/core/Mage/CatalogIndex/Model/Observer.php +4 -4
  877. app/code/core/Mage/CatalogIndex/Model/Price.php +4 -4
  878. app/code/core/Mage/CatalogIndex/Model/Resource/Abstract.php +4 -4
  879. app/code/core/Mage/CatalogIndex/Model/Resource/Aggregation.php +4 -4
  880. app/code/core/Mage/CatalogIndex/Model/Resource/Attribute.php +4 -4
  881. app/code/core/Mage/CatalogIndex/Model/Resource/Data/Abstract.php +4 -4
  882. app/code/core/Mage/CatalogIndex/Model/Resource/Data/Configurable.php +4 -4
  883. app/code/core/Mage/CatalogIndex/Model/Resource/Data/Grouped.php +4 -4
  884. app/code/core/Mage/CatalogIndex/Model/Resource/Indexer.php +4 -4
  885. app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Abstract.php +4 -4
  886. app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Eav.php +4 -4
  887. app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Minimalprice.php +4 -4
  888. app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Price.php +4 -4
  889. app/code/core/Mage/CatalogIndex/Model/Resource/Price.php +4 -4
  890. app/code/core/Mage/CatalogIndex/Model/Resource/Retreiver.php +4 -4
  891. app/code/core/Mage/CatalogIndex/Model/Resource/Setup.php +4 -4
  892. app/code/core/Mage/CatalogIndex/Model/Retreiver.php +4 -4
  893. app/code/core/Mage/CatalogIndex/etc/config.xml +3 -3
  894. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/install-1.6.0.0.php +4 -4
  895. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-install-0.7.0.php +4 -4
  896. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.0-0.7.1.php +4 -4
  897. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.1-0.7.2.php +4 -4
  898. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.2-0.7.3.php +4 -4
  899. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.3-0.7.4.php +4 -4
  900. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.4-0.7.5.php +4 -4
  901. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.5-0.7.6.php +4 -4
  902. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.6-0.7.7.php +4 -4
  903. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.7-0.7.8.php +4 -4
  904. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.8-0.7.9.php +4 -4
  905. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-0.7.9-0.7.10.php +4 -4
  906. app/code/core/Mage/CatalogIndex/sql/catalogindex_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +4 -4
  907. app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Customergroup.php +4 -4
  908. app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php +4 -4
  909. app/code/core/Mage/CatalogInventory/Block/Qtyincrements.php +4 -4
  910. app/code/core/Mage/CatalogInventory/Block/Stockqty/Abstract.php +4 -4
  911. app/code/core/Mage/CatalogInventory/Block/Stockqty/Composite.php +4 -4
  912. app/code/core/Mage/CatalogInventory/Block/Stockqty/Default.php +4 -4
  913. app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Configurable.php +4 -4
  914. app/code/core/Mage/CatalogInventory/Block/Stockqty/Type/Grouped.php +4 -4
  915. app/code/core/Mage/CatalogInventory/Helper/Data.php +4 -4
  916. app/code/core/Mage/CatalogInventory/Helper/Minsaleqty.php +4 -4
  917. app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item.php +4 -4
  918. app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest.php +4 -4
  919. app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest/Admin/V1.php +4 -4
  920. app/code/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Validator/Item.php +4 -4
  921. app/code/core/Mage/CatalogInventory/Model/Indexer/Stock.php +4 -4
  922. app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock.php +4 -4
  923. app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Configurable.php +4 -4
  924. app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Default.php +4 -4
  925. app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Grouped.php +4 -4
  926. app/code/core/Mage/CatalogInventory/Model/Mysql4/Indexer/Stock/Interface.php +4 -4
  927. app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock.php +4 -4
  928. app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item.php +4 -4
  929. app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Item/Collection.php +4 -4
  930. app/code/core/Mage/CatalogInventory/Model/Mysql4/Stock/Status.php +4 -4
  931. app/code/core/Mage/CatalogInventory/Model/Observer.php +4 -4
  932. app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php +4 -4
  933. app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Configurable.php +4 -4
  934. app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Default.php +10 -7
  935. app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Grouped.php +4 -4
  936. app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock/Interface.php +4 -4
  937. app/code/core/Mage/CatalogInventory/Model/Resource/Stock.php +4 -4
  938. app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item.php +4 -4
  939. app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item/Collection.php +4 -4
  940. app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php +4 -4
  941. app/code/core/Mage/CatalogInventory/Model/Source/Backorders.php +4 -4
  942. app/code/core/Mage/CatalogInventory/Model/Source/Stock.php +4 -4
  943. app/code/core/Mage/CatalogInventory/Model/Stock.php +4 -4
  944. app/code/core/Mage/CatalogInventory/Model/Stock/Item.php +24 -24
  945. app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php +4 -4
  946. app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api/V2.php +4 -4
  947. app/code/core/Mage/CatalogInventory/Model/Stock/Status.php +4 -4
  948. app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minqty.php +4 -4
  949. app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Minsaleqty.php +4 -4
  950. app/code/core/Mage/CatalogInventory/Model/System/Config/Backend/Qtyincrements.php +4 -4
  951. app/code/core/Mage/CatalogInventory/etc/adminhtml.xml +3 -3
  952. app/code/core/Mage/CatalogInventory/etc/api.xml +3 -3
  953. app/code/core/Mage/CatalogInventory/etc/api2.xml +3 -3
  954. app/code/core/Mage/CatalogInventory/etc/config.xml +3 -3
  955. app/code/core/Mage/CatalogInventory/etc/system.xml +3 -3
  956. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/install-1.6.0.0.php +4 -4
  957. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-install-0.7.0.php +4 -4
  958. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.0-0.7.1.php +4 -4
  959. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.1-0.7.2.php +4 -4
  960. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.2-0.7.3.php +4 -4
  961. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.3-0.7.4.php +4 -4
  962. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.4-0.7.5.php +4 -4
  963. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.5-0.7.6.php +4 -4
  964. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.6-0.7.7.php +4 -4
  965. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-0.7.7-0.7.8.php +4 -4
  966. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +4 -4
  967. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/mysql4-upgrade-1.6.0.0-1.6.0.0.1.php +4 -4
  968. app/code/core/Mage/CatalogInventory/sql/cataloginventory_setup/upgrade-1.6.0.0.1-1.6.0.0.2.php +4 -4
  969. app/code/core/Mage/CatalogRule/Helper/Data.php +4 -4
  970. app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh.php +5 -5
  971. app/code/core/Mage/CatalogRule/Model/Action/Index/Refresh/Row.php +11 -4
  972. app/code/core/Mage/CatalogRule/Model/Flag.php +4 -4
  973. app/code/core/Mage/CatalogRule/Model/Mysql4/Rule.php +4 -4
  974. app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Collection.php +4 -4
  975. app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price.php +4 -4
  976. app/code/core/Mage/CatalogRule/Model/Mysql4/Rule/Product/Price/Collection.php +4 -4
  977. app/code/core/Mage/CatalogRule/Model/Observer.php +25 -7
  978. app/code/core/Mage/CatalogRule/Model/Resource/Rule.php +54 -18
  979. app/code/core/Mage/CatalogRule/Model/Resource/Rule/Collection.php +4 -4
  980. app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price.php +4 -4
  981. app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price/Collection.php +4 -4
  982. app/code/core/Mage/CatalogRule/Model/Rule.php +19 -5
  983. app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php +4 -4
  984. app/code/core/Mage/CatalogRule/Model/Rule/Action/Product.php +4 -4
  985. app/code/core/Mage/CatalogRule/Model/Rule/Condition/Combine.php +4 -4
  986. app/code/core/Mage/CatalogRule/Model/Rule/Condition/Product.php +4 -4
  987. app/code/core/Mage/CatalogRule/Model/Rule/Product/Price.php +4 -4
  988. app/code/core/Mage/CatalogRule/etc/adminhtml.xml +3 -3
  989. app/code/core/Mage/CatalogRule/etc/config.xml +11 -3
  990. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/install-1.6.0.0.php +4 -4
  991. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-install-0.7.0.php +4 -4
  992. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.0-0.7.1.php +4 -4
  993. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.1-0.7.2.php +4 -4
  994. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.2-0.7.3.php +4 -4
  995. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.3-0.7.4.php +4 -4
  996. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.4-0.7.5.php +4 -4
  997. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.5-0.7.6.php +4 -4
  998. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.6-0.7.7.php +4 -4
  999. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.7-0.7.8.php +4 -4
  1000. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.8-0.7.9.php +4 -4
  1001. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-0.7.9-0.7.10.php +4 -4
  1002. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +4 -4
  1003. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.0-1.6.0.1.php +4 -4
  1004. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.1-1.6.0.2.php +4 -4
  1005. app/code/core/Mage/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.2-1.6.0.3.php +4 -4
  1006. app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php +4 -4
  1007. app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php +4 -4
  1008. app/code/core/Mage/CatalogSearch/Block/Autocomplete.php +4 -4
  1009. app/code/core/Mage/CatalogSearch/Block/Layer.php +4 -4
  1010. app/code/core/Mage/CatalogSearch/Block/Layer/Filter/Attribute.php +4 -4
  1011. app/code/core/Mage/CatalogSearch/Block/Result.php +4 -4
  1012. app/code/core/Mage/CatalogSearch/Block/Term.php +4 -4
  1013. app/code/core/Mage/CatalogSearch/Helper/Data.php +4 -4
  1014. app/code/core/Mage/CatalogSearch/Model/Advanced.php +4 -4
  1015. app/code/core/Mage/CatalogSearch/Model/Fulltext.php +4 -4
  1016. app/code/core/Mage/CatalogSearch/Model/Fulltext/Observer.php +4 -4
  1017. app/code/core/Mage/CatalogSearch/Model/Indexer/Fulltext.php +4 -4
  1018. app/code/core/Mage/CatalogSearch/Model/Layer.php +4 -4
  1019. app/code/core/Mage/CatalogSearch/Model/Layer/Filter/Attribute.php +4 -4
  1020. app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced.php +4 -4
  1021. app/code/core/Mage/CatalogSearch/Model/Mysql4/Advanced/Collection.php +4 -4
  1022. app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext.php +4 -4
  1023. app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Collection.php +4 -4
  1024. app/code/core/Mage/CatalogSearch/Model/Mysql4/Fulltext/Engine.php +4 -4
  1025. app/code/core/Mage/CatalogSearch/Model/Mysql4/Indexer/Fulltext.php +4 -4
  1026. app/code/core/Mage/CatalogSearch/Model/Mysql4/Query.php +4 -4
  1027. app/code/core/Mage/CatalogSearch/Model/Mysql4/Query/Collection.php +4 -4
  1028. app/code/core/Mage/CatalogSearch/Model/Mysql4/Search/Collection.php +4 -4
  1029. app/code/core/Mage/CatalogSearch/Model/Query.php +4 -4
  1030. app/code/core/Mage/CatalogSearch/Model/Resource/Advanced.php +4 -4
  1031. app/code/core/Mage/CatalogSearch/Model/Resource/Advanced/Collection.php +4 -4
  1032. app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php +4 -4
  1033. app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Collection.php +4 -4
  1034. app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Engine.php +4 -4
  1035. app/code/core/Mage/CatalogSearch/Model/Resource/Helper/Mysql4.php +4 -4
  1036. app/code/core/Mage/CatalogSearch/Model/Resource/Indexer/Fulltext.php +4 -4
  1037. app/code/core/Mage/CatalogSearch/Model/Resource/Query.php +4 -4
  1038. app/code/core/Mage/CatalogSearch/Model/Resource/Query/Collection.php +4 -4
  1039. app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php +4 -4
  1040. app/code/core/Mage/CatalogSearch/Model/Session.php +4 -4
  1041. app/code/core/Mage/CatalogSearch/Model/System/Config/Backend/Sitemap.php +4 -4
  1042. app/code/core/Mage/CatalogSearch/controllers/AdvancedController.php +4 -4
  1043. app/code/core/Mage/CatalogSearch/controllers/AjaxController.php +4 -4
  1044. app/code/core/Mage/CatalogSearch/controllers/ResultController.php +4 -4
  1045. app/code/core/Mage/CatalogSearch/controllers/TermController.php +4 -4
  1046. app/code/core/Mage/CatalogSearch/etc/adminhtml.xml +3 -3
  1047. app/code/core/Mage/CatalogSearch/etc/config.xml +3 -3
  1048. app/code/core/Mage/CatalogSearch/etc/system.xml +3 -3
  1049. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/install-1.6.0.0.php +4 -4
  1050. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-install-0.7.0.php +4 -4
  1051. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.1-0.7.2.php +4 -4
  1052. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.2-0.7.3.php +4 -4
  1053. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.3-0.7.4.php +4 -4
  1054. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.4-0.7.5.php +4 -4
  1055. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.5-0.7.6.php +4 -4
  1056. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-0.7.6-0.7.7.php +4 -4
  1057. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +4 -4
  1058. app/code/core/Mage/CatalogSearch/sql/catalogsearch_setup/upgrade-1.6.0.0-1.8.2.0.php +4 -4
  1059. app/code/core/Mage/Checkout/Block/Agreements.php +4 -4
  1060. app/code/core/Mage/Checkout/Block/Cart.php +4 -4
  1061. app/code/core/Mage/Checkout/Block/Cart/Abstract.php +4 -4
  1062. app/code/core/Mage/Checkout/Block/Cart/Coupon.php +4 -4
  1063. app/code/core/Mage/Checkout/Block/Cart/Crosssell.php +4 -4
  1064. app/code/core/Mage/Checkout/Block/Cart/Item/Configure.php +4 -4
  1065. app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php +4 -4
  1066. app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Configurable.php +4 -4
  1067. app/code/core/Mage/Checkout/Block/Cart/Item/Renderer/Grouped.php +4 -4
  1068. app/code/core/Mage/Checkout/Block/Cart/Minicart.php +4 -4
  1069. app/code/core/Mage/Checkout/Block/Cart/Shipping.php +4 -4
  1070. app/code/core/Mage/Checkout/Block/Cart/Sidebar.php +4 -4
  1071. app/code/core/Mage/Checkout/Block/Cart/Totals.php +4 -4
  1072. app/code/core/Mage/Checkout/Block/Links.php +4 -4
  1073. app/code/core/Mage/Checkout/Block/Multishipping/Abstract.php +4 -4
  1074. app/code/core/Mage/Checkout/Block/Multishipping/Address/Select.php +4 -4
  1075. app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php +4 -4
  1076. app/code/core/Mage/Checkout/Block/Multishipping/Billing.php +4 -4
  1077. app/code/core/Mage/Checkout/Block/Multishipping/Billing/Items.php +4 -4
  1078. app/code/core/Mage/Checkout/Block/Multishipping/Link.php +4 -4
  1079. app/code/core/Mage/Checkout/Block/Multishipping/Overview.php +4 -4
  1080. app/code/core/Mage/Checkout/Block/Multishipping/Payment/Info.php +4 -4
  1081. app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php +4 -4
  1082. app/code/core/Mage/Checkout/Block/Multishipping/State.php +4 -4
  1083. app/code/core/Mage/Checkout/Block/Multishipping/Success.php +4 -4
  1084. app/code/core/Mage/Checkout/Block/Onepage.php +4 -4
  1085. app/code/core/Mage/Checkout/Block/Onepage/Abstract.php +4 -4
  1086. app/code/core/Mage/Checkout/Block/Onepage/Billing.php +4 -4
  1087. app/code/core/Mage/Checkout/Block/Onepage/Failure.php +4 -4
  1088. app/code/core/Mage/Checkout/Block/Onepage/Link.php +4 -4
  1089. app/code/core/Mage/Checkout/Block/Onepage/Login.php +4 -4
  1090. app/code/core/Mage/Checkout/Block/Onepage/Payment.php +4 -4
  1091. app/code/core/Mage/Checkout/Block/Onepage/Payment/Info.php +4 -4
  1092. app/code/core/Mage/Checkout/Block/Onepage/Payment/Methods.php +4 -4
  1093. app/code/core/Mage/Checkout/Block/Onepage/Progress.php +4 -4
  1094. app/code/core/Mage/Checkout/Block/Onepage/Review.php +4 -4
  1095. app/code/core/Mage/Checkout/Block/Onepage/Review/Info.php +4 -4
  1096. app/code/core/Mage/Checkout/Block/Onepage/Shipping.php +4 -4
  1097. app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method.php +4 -4
  1098. app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Additional.php +4 -4
  1099. app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php +4 -4
  1100. app/code/core/Mage/Checkout/Block/Onepage/Success.php +4 -4
  1101. app/code/core/Mage/Checkout/Block/Success.php +4 -4
  1102. app/code/core/Mage/Checkout/Block/Total/Default.php +4 -4
  1103. app/code/core/Mage/Checkout/Block/Total/Nominal.php +4 -4
  1104. app/code/core/Mage/Checkout/Block/Total/Tax.php +4 -4
  1105. app/code/core/Mage/Checkout/Controller/Action.php +4 -4
  1106. app/code/core/Mage/Checkout/Exception.php +4 -4
  1107. app/code/core/Mage/Checkout/Helper/Cart.php +4 -4
  1108. app/code/core/Mage/Checkout/Helper/Data.php +4 -4
  1109. app/code/core/Mage/Checkout/Helper/Url.php +4 -4
  1110. app/code/core/Mage/Checkout/Model/Agreement.php +4 -4
  1111. app/code/core/Mage/Checkout/Model/Api/Resource.php +4 -4
  1112. app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php +4 -5
  1113. app/code/core/Mage/Checkout/Model/Api/Resource/Product.php +4 -4
  1114. app/code/core/Mage/Checkout/Model/Cart.php +4 -4
  1115. app/code/core/Mage/Checkout/Model/Cart/Api.php +5 -5
  1116. app/code/core/Mage/Checkout/Model/Cart/Api/V2.php +4 -4
  1117. app/code/core/Mage/Checkout/Model/Cart/Coupon/Api.php +4 -4
  1118. app/code/core/Mage/Checkout/Model/Cart/Coupon/Api/V2.php +4 -4
  1119. app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php +9 -9
  1120. app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php +4 -4
  1121. app/code/core/Mage/Checkout/Model/Cart/Interface.php +4 -4
  1122. app/code/core/Mage/Checkout/Model/Cart/Payment/Api.php +4 -4
  1123. app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.php +4 -4
  1124. app/code/core/Mage/Checkout/Model/Cart/Product/Api.php +4 -4
  1125. app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php +4 -4
  1126. app/code/core/Mage/Checkout/Model/Cart/Shipping/Api.php +4 -4
  1127. app/code/core/Mage/Checkout/Model/Cart/Shipping/Api/V2.php +4 -4
  1128. app/code/core/Mage/Checkout/Model/Config/Source/Cart/Summary.php +4 -4
  1129. app/code/core/Mage/Checkout/Model/Mysql4/Agreement.php +4 -4
  1130. app/code/core/Mage/Checkout/Model/Mysql4/Agreement/Collection.php +4 -4
  1131. app/code/core/Mage/Checkout/Model/Mysql4/Cart.php +4 -4
  1132. app/code/core/Mage/Checkout/Model/Mysql4/Setup.php +4 -4
  1133. app/code/core/Mage/Checkout/Model/Observer.php +4 -4
  1134. app/code/core/Mage/Checkout/Model/Resource/Agreement.php +4 -4
  1135. app/code/core/Mage/Checkout/Model/Resource/Agreement/Collection.php +4 -4
  1136. app/code/core/Mage/Checkout/Model/Resource/Cart.php +4 -4
  1137. app/code/core/Mage/Checkout/Model/Resource/Setup.php +4 -4
  1138. app/code/core/Mage/Checkout/Model/Session.php +4 -4
  1139. app/code/core/Mage/Checkout/Model/Type/Abstract.php +4 -4
  1140. app/code/core/Mage/Checkout/Model/Type/Multishipping.php +5 -5
  1141. app/code/core/Mage/Checkout/Model/Type/Multishipping/State.php +4 -4
  1142. app/code/core/Mage/Checkout/Model/Type/Onepage.php +7 -8
  1143. app/code/core/Mage/Checkout/controllers/CartController.php +4 -4
  1144. app/code/core/Mage/Checkout/controllers/IndexController.php +4 -4
  1145. app/code/core/Mage/Checkout/controllers/Multishipping/AddressController.php +4 -4
  1146. app/code/core/Mage/Checkout/controllers/MultishippingController.php +4 -4
  1147. app/code/core/Mage/Checkout/controllers/OnepageController.php +4 -4
  1148. app/code/core/Mage/Checkout/etc/adminhtml.xml +3 -3
  1149. app/code/core/Mage/Checkout/etc/api.xml +3 -3
  1150. app/code/core/Mage/Checkout/etc/config.xml +3 -3
  1151. app/code/core/Mage/Checkout/etc/jstranslator.xml +3 -3
  1152. app/code/core/Mage/Checkout/etc/system.xml +3 -3
  1153. app/code/core/Mage/Checkout/sql/checkout_setup/install-1.6.0.0.php +4 -4
  1154. app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-install-0.9.1.php +4 -4
  1155. app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.0-0.9.1.php +4 -4
  1156. app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.1-0.9.2.php +4 -4
  1157. app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.2-0.9.3.php +4 -4
  1158. app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.3-0.9.4.php +4 -4
  1159. app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-0.9.4-0.9.5.php +4 -4
  1160. app/code/core/Mage/Checkout/sql/checkout_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +4 -4
  1161. app/code/core/Mage/Cms/Block/Block.php +4 -4
  1162. app/code/core/Mage/Cms/Block/Page.php +4 -4
  1163. app/code/core/Mage/Cms/Block/Widget/Block.php +4 -4
  1164. app/code/core/Mage/Cms/Block/Widget/Page/Link.php +4 -4
  1165. app/code/core/Mage/Cms/Controller/Router.php +4 -4
  1166. app/code/core/Mage/Cms/Helper/Data.php +4 -4
  1167. app/code/core/Mage/Cms/Helper/Page.php +4 -4
  1168. app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php +4 -4
  1169. app/code/core/Mage/Cms/Model/Adminhtml/Template/Filter.php +4 -4
  1170. app/code/core/Mage/Cms/Model/Block.php +4 -4
  1171. app/code/core/Mage/Cms/Model/Mysql4/Block.php +4 -4
  1172. app/code/core/Mage/Cms/Model/Mysql4/Block/Collection.php +4 -4
  1173. app/code/core/Mage/Cms/Model/Mysql4/Page.php +4 -4
  1174. app/code/core/Mage/Cms/Model/Mysql4/Page/Collection.php +4 -4
  1175. app/code/core/Mage/Cms/Model/Mysql4/Page/Service.php +4 -4
  1176. app/code/core/Mage/Cms/Model/Observer.php +4 -4
  1177. app/code/core/Mage/Cms/Model/Page.php +4 -4
  1178. app/code/core/Mage/Cms/Model/Resource/Block.php +4 -4
  1179. app/code/core/Mage/Cms/Model/Resource/Block/Collection.php +4 -4
  1180. app/code/core/Mage/Cms/Model/Resource/Page.php +4 -4
  1181. app/code/core/Mage/Cms/Model/Resource/Page/Collection.php +4 -4
  1182. app/code/core/Mage/Cms/Model/Resource/Page/Service.php +4 -4
  1183. app/code/core/Mage/Cms/Model/Template/Filter.php +4 -4
  1184. app/code/core/Mage/Cms/Model/Wysiwyg/Config.php +4 -4
  1185. app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php +4 -4
  1186. app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage/Collection.php +4 -4
  1187. app/code/core/Mage/Cms/controllers/IndexController.php +4 -4
  1188. app/code/core/Mage/Cms/controllers/PageController.php +4 -4
  1189. app/code/core/Mage/Cms/data/cms_setup/data-install-1.6.0.0.php +4 -4
  1190. app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.0-1.6.0.0.1.php +4 -4
  1191. app/code/core/Mage/Cms/data/cms_setup/data-upgrade-1.6.0.0.1-1.6.0.0.2.php +4 -4
  1192. app/code/core/Mage/Cms/etc/adminhtml.xml +3 -3
  1193. app/code/core/Mage/Cms/etc/config.xml +3 -3
  1194. app/code/core/Mage/Cms/etc/system.xml +3 -3
  1195. app/code/core/Mage/Cms/etc/widget.xml +3 -3
  1196. app/code/core/Mage/Cms/sql/cms_setup/install-1.6.0.0.php +4 -4
  1197. app/code/core/Mage/Cms/sql/cms_setup/mysql4-install-0.7.0.php +4 -4
  1198. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.0-0.7.1.php +4 -4
  1199. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.1-0.7.2.php +4 -4
  1200. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.10-0.7.11.php +4 -4
  1201. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.11-0.7.12.php +4 -4
  1202. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.12-0.7.13.php +4 -4
  1203. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.2-0.7.3.php +4 -4
  1204. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.4-0.7.5.php +4 -4
  1205. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.5-0.7.6.php +4 -4
  1206. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.7-0.7.8.php +4 -4
  1207. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.8-0.7.9.php +4 -4
  1208. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-0.7.9-0.7.10.php +4 -4
  1209. app/code/core/Mage/Cms/sql/cms_setup/mysql4-upgrade-1.5.9.9-1.6.0.0.php +4 -4
  1210. app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Layer/State/Swatch.php +80 -0
  1211. app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/Abstract.php +114 -0
  1212. app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/List.php +62 -0
  1213. app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Media/Js/Product.php +67 -0
  1214. app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Product/View/Type/Configurable/Swatches.php +71 -0
  1215. app/code/core/Mage/ConfigurableSwatches/Helper/Data.php +114 -0
  1216. app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php +424 -0
  1217. app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php +347 -0
  1218. app/code/core/Mage/ConfigurableSwatches/Helper/Productlist.php +147 -0
  1219. app/code/core/Mage/ConfigurableSwatches/Helper/Swatchdimensions.php +107 -0
  1220. app/code/core/Mage/ConfigurableSwatches/Model/Observer.php +164 -0
  1221. app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Attribute/Super/Collection.php +138 -0
  1222. app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable.php +61 -0
  1223. app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable/Product/Collection.php +87 -0
  1224. app/code/core/Mage/ConfigurableSwatches/Model/System/Config/Source/Catalog/Product/Configattribute.php +62 -0
  1225. app/code/core/Mage/ConfigurableSwatches/Model/System/Config/Source/Catalog/Product/Configattribute/Select.php +48 -0
  1226. app/code/core/Mage/ConfigurableSwatches/etc/adminhtml.xml +48 -0
  1227. app/code/core/Mage/ConfigurableSwatches/etc/config.xml +153 -0
  1228. app/code/core/Mage/ConfigurableSwatches/etc/jstranslator.xml +40 -0
  1229. app/code/core/Mage/ConfigurableSwatches/etc/system.xml +157 -0
  1230. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit.php +4 -4
  1231. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Form.php +4 -4
  1232. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Abstract.php +4 -4
  1233. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Authors.php +4 -4
  1234. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Contents.php +4 -4
  1235. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Depends.php +4 -4
  1236. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Grid.php +4 -4
  1237. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Load.php +4 -4
  1238. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Local.php +4 -4
  1239. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Package.php +4 -4
  1240. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Release.php +4 -4
  1241. app/code/core/Mage/Connect/Block/Adminhtml/Extension/Custom/Edit/Tabs.php +4 -4
  1242. app/code/core/Mage/Connect/Helper/Data.php +4 -4
  1243. app/code/core/Mage/Connect/Model/Extension.php +4 -4
  1244. app/code/core/Mage/Connect/Model/Extension/Collection.php +4 -4
  1245. app/code/core/Mage/Connect/Model/Session.php +4 -4
  1246. app/code/core/Mage/Connect/controllers/Adminhtml/Extension/CustomController.php +4 -4
  1247. app/code/core/Mage/Connect/controllers/Adminhtml/Extension/LocalController.php +4 -4
  1248. app/code/core/Mage/Connect/etc/adminhtml.xml +3 -3
  1249. app/code/core/Mage/Connect/etc/config.xml +3 -3
  1250. app/code/core/Mage/Contacts/Helper/Data.php +4 -4
  1251. app/code/core/Mage/Contacts/Model/System/Config/Backend/Links.php +4 -4
  1252. app/code/core/Mage/Contacts/controllers/IndexController.php +4 -4
  1253. app/code/core/Mage/Contacts/etc/adminhtml.xml +3 -3
  1254. app/code/core/Mage/Contacts/etc/config.xml +3 -3
  1255. app/code/core/Mage/Contacts/etc/system.xml +3 -3
  1256. app/code/core/Mage/Contacts/sql/contacts_setup/install-1.6.0.0.php +4 -4
  1257. app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.7.1.php +4 -4
  1258. app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-install-0.8.0.php +4 -4
  1259. app/code/core/Mage/Contacts/sql/contacts_setup/mysql4-upgrade-0.7.1-0.7.2.php +4 -4
  1260. app/code/core/Mage/Core/Block/Abstract.php +4 -4
  1261. app/code/core/Mage/Core/Block/Flush.php +4 -4
  1262. app/code/core/Mage/Core/Block/Html/Calendar.php +4 -4
  1263. app/code/core/Mage/Core/Block/Html/Date.php +4 -4
  1264. app/code/core/Mage/Core/Block/Html/Link.php +4 -4
  1265. app/code/core/Mage/Core/Block/Html/Select.php +4 -4
  1266. app/code/core/Mage/Core/Block/Messages.php +4 -4
  1267. app/code/core/Mage/Core/Block/Profiler.php +4 -4
  1268. app/code/core/Mage/Core/Block/Store/Switcher.php +4 -4
  1269. app/code/core/Mage/Core/Block/Template.php +4 -4
  1270. app/code/core/Mage/Core/Block/Template/Facade.php +4 -4
  1271. app/code/core/Mage/Core/Block/Template/Smarty.php +4 -4
  1272. app/code/core/Mage/Core/Block/Template/Zend.php +4 -4
  1273. app/code/core/Mage/Core/Block/Text.php +4 -4
  1274. app/code/core/Mage/Core/Block/Text/List.php +4 -4
  1275. app/code/core/Mage/Core/Block/Text/List/Item.php +4 -4
  1276. app/code/core/Mage/Core/Block/Text/List/Link.php +4 -4
  1277. app/code/core/Mage/Core/Block/Text/Tag.php +4 -4
  1278. app/code/core/Mage/Core/Block/Text/Tag/Css.php +4 -4
  1279. app/code/core/Mage/Core/Block/Text/Tag/Css/Admin.php +4 -4
  1280. app/code/core/Mage/Core/Block/Text/Tag/Debug.php +4 -4
  1281. app/code/core/Mage/Core/Block/Text/Tag/Js.php +4 -4
  1282. app/code/core/Mage/Core/Block/Text/Tag/Meta.php +4 -4
  1283. app/code/core/Mage/Core/Controller/Front/Action.php +4 -4
  1284. app/code/core/Mage/Core/Controller/Front/Router.php +4 -4
  1285. app/code/core/Mage/Core/Controller/Request/Http.php +4 -4
  1286. app/code/core/Mage/Core/Controller/Response/Http.php +4 -4
  1287. app/code/core/Mage/Core/Controller/Varien/Action.php +6 -6
  1288. app/code/core/Mage/Core/Controller/Varien/Exception.php +4 -4
  1289. app/code/core/Mage/Core/Controller/Varien/Front.php +4 -4
  1290. app/code/core/Mage/Core/Controller/Varien/Router/Abstract.php +4 -4
  1291. app/code/core/Mage/Core/Controller/Varien/Router/Admin.php +4 -4
  1292. app/code/core/Mage/Core/Controller/Varien/Router/Default.php +29 -9
  1293. app/code/core/Mage/Core/Controller/Varien/Router/Standard.php +4 -4
  1294. app/code/core/Mage/Core/Exception.php +4 -4
  1295. app/code/core/Mage/Core/Helper/Abstract.php +26 -5
  1296. app/code/core/Mage/Core/Helper/Array.php +4 -4
  1297. app/code/core/Mage/Core/Helper/Cookie.php +4 -4
  1298. app/code/core/Mage/Core/Helper/Data.php +4 -4
  1299. app/code/core/Mage/Core/Helper/File/Storage.php +4 -4
  1300. app/code/core/Mage/Core/Helper/File/Storage/Database.php +4 -4
  1301. app/code/core/Mage/Core/Helper/Hint.php +4 -4
  1302. app/code/core/Mage/Core/Helper/Http.php +4 -4
  1303. app/code/core/Mage/Core/Helper/Js.php +4 -4
  1304. app/code/core/Mage/Core/Helper/String.php +4 -4
  1305. app/code/core/Mage/Core/Helper/Translate.php +4 -4
  1306. app/code/core/Mage/Core/Helper/Url.php +4 -4
  1307. app/code/core/Mage/Core/Helper/Url/Rewrite.php +4 -4
  1308. app/code/core/Mage/Core/Model/Abstract.php +4 -4
  1309. app/code/core/Mage/Core/Model/App.php +4 -4
  1310. app/code/core/Mage/Core/Model/App/Area.php +4 -4
  1311. app/code/core/Mage/Core/Model/App/Emulation.php +4 -4
  1312. app/code/core/Mage/Core/Model/Cache.php +5 -5
  1313. app/code/core/Mage/Core/Model/Calculator.php +4 -4
  1314. app/code/core/Mage/Core/Model/Config.php +4 -4
  1315. app/code/core/Mage/Core/Model/Config/Base.php +4 -4
  1316. app/code/core/Mage/Core/Model/Config/Data.php +4 -4
  1317. app/code/core/Mage/Core/Model/Config/Element.php +4 -4
  1318. app/code/core/Mage/Core/Model/Config/Options.php +4 -4
  1319. app/code/core/Mage/Core/Model/Config/System.php +4 -4
  1320. app/code/core/Mage/Core/Model/Convert.php +4 -4
  1321. app/code/core/Mage/Core/Model/Cookie.php +4 -4
  1322. app/code/core/Mage/Core/Model/Date.php +5 -5
  1323. app/code/core/Mage/Core/Model/Design.php +4 -4
  1324. app/code/core/Mage/Core/Model/Design/Config.php +4 -4
  1325. app/code/core/Mage/Core/Model/Design/Fallback.php +4 -4
  1326. app/code/core/Mage/Core/Model/Design/Package.php +4 -4
  1327. app/code/core/Mage/Core/Model/Design/Source/Apply.php +4 -4
  1328. app/code/core/Mage/Core/Model/Design/Source/Design.php +4 -4
  1329. app/code/core/Mage/Core/Model/Domainpolicy.php +4 -4
  1330. app/code/core/Mage/Core/Model/Email.php +4 -4
  1331. app/code/core/Mage/Core/Model/Email/Info.php +4 -4
  1332. app/code/core/Mage/Core/Model/Email/Queue.php +271 -0
  1333. app/code/core/Mage/Core/Model/Email/Template.php +73 -69
  1334. app/code/core/Mage/Core/Model/Email/Template/Abstract.php +304 -0
  1335. app/code/core/Mage/Core/Model/Email/Template/Filter.php +48 -4
  1336. app/code/core/Mage/Core/Model/Email/Template/Mailer.php +16 -11
  1337. app/code/core/Mage/Core/Model/Email/Transport.php +4 -4
  1338. app/code/core/Mage/Core/Model/Encryption.php +4 -4
  1339. app/code/core/Mage/Core/Model/Factory.php +4 -4
  1340. app/code/core/Mage/Core/Model/File/Storage.php +4 -4
  1341. app/code/core/Mage/Core/Model/File/Storage/Abstract.php +4 -4
  1342. app/code/core/Mage/Core/Model/File/Storage/Database.php +4 -4
  1343. app/code/core/Mage/Core/Model/File/Storage/Database/Abstract.php +4 -4
  1344. app/code/core/Mage/Core/Model/File/Storage/Directory/Database.php +4 -4
  1345. app/code/core/Mage/Core/Model/File/Storage/File.php +4 -4
  1346. app/code/core/Mage/Core/Model/File/Storage/Flag.php +4 -4
  1347. app/code/core/Mage/Core/Model/File/Uploader.php +4 -4
  1348. app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php +4 -4
  1349. app/code/core/Mage/Core/Model/File/Validator/NotProtectedExtension.php +4 -4
  1350. app/code/core/Mage/Core/Model/Flag.php +4 -4
  1351. app/code/core/Mage/Core/Model/Input/Filter.php +4 -4
  1352. app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php +4 -4
  1353. app/code/core/Mage/Core/Model/Language.php +4 -4
  1354. app/code/core/Mage/Core/Model/Layout.php +4 -4
  1355. app/code/core/Mage/Core/Model/Layout/Data.php +4 -4
  1356. app/code/core/Mage/Core/Model/Layout/Element.php +4 -4
  1357. app/code/core/Mage/Core/Model/Layout/Update.php +4 -4
  1358. app/code/core/Mage/Core/Model/Locale.php +40 -14
  1359. app/code/core/Mage/Core/Model/Locale/Config.php +4 -4
  1360. app/code/core/Mage/Core/Model/Log/Adapter.php +4 -4
  1361. app/code/core/Mage/Core/Model/Logger.php +4 -4
  1362. app/code/core/Mage/Core/Model/Magento/Api.php +4 -4
  1363. app/code/core/Mage/Core/Model/Magento/Api/V2.php +4 -4
  1364. app/code/core/Mage/Core/Model/Message.php +4 -4
  1365. app/code/core/Mage/Core/Model/Message/Abstract.php +4 -4
  1366. app/code/core/Mage/Core/Model/Message/Collection.php +4 -4
  1367. app/code/core/Mage/Core/Model/Message/Error.php +4 -4
  1368. app/code/core/Mage/Core/Model/Message/Notice.php +4 -4
  1369. app/code/core/Mage/Core/Model/Message/Success.php +4 -4
  1370. app/code/core/Mage/Core/Model/Message/Warning.php +4 -4
  1371. app/code/core/Mage/Core/Model/Mysql4/Abstract.php +4 -4
  1372. app/code/core/Mage/Core/Model/Mysql4/Cache.php +4 -4
  1373. app/code/core/Mage/Core/Model/Mysql4/Collection/Abstract.php +4 -4
  1374. app/code/core/Mage/Core/Model/Mysql4/Config.php +4 -4
  1375. app/code/core/Mage/Core/Model/Mysql4/Config/Data.php +4 -4
  1376. app/code/core/Mage/Core/Model/Mysql4/Config/Data/Collection.php +4 -4
  1377. app/code/core/Mage/Core/Model/Mysql4/Design.php +4 -4
  1378. app/code/core/Mage/Core/Model/Mysql4/Design/Collection.php +4 -4
  1379. app/code/core/Mage/Core/Model/Mysql4/Design/Package/Collection.php +4 -4
  1380. app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php +4 -4
  1381. app/code/core/Mage/Core/Model/Mysql4/Email/Template.php +4 -4
  1382. app/code/core/Mage/Core/Model/Mysql4/Email/Template/Collection.php +4 -4
  1383. app/code/core/Mage/Core/Model/Mysql4/File/Storage/Abstract.php +4 -4
  1384. app/code/core/Mage/Core/Model/Mysql4/File/Storage/Database.php +4 -4
  1385. app/code/core/Mage/Core/Model/Mysql4/File/Storage/Directory/Database.php +4 -4
  1386. app/code/core/Mage/Core/Model/Mysql4/File/Storage/File.php +4 -4
  1387. app/code/core/Mage/Core/Model/Mysql4/Flag.php +4 -4
  1388. app/code/core/Mage/Core/Model/Mysql4/Language.php +4 -4
  1389. app/code/core/Mage/Core/Model/Mysql4/Language/Collection.php +4 -4
  1390. app/code/core/Mage/Core/Model/Mysql4/Layout.php +4 -4
  1391. app/code/core/Mage/Core/Model/Mysql4/Resource.php +4 -4
  1392. app/code/core/Mage/Core/Model/Mysql4/Session.php +4 -4
  1393. app/code/core/Mage/Core/Model/Mysql4/Store.php +4 -4
  1394. app/code/core/Mage/Core/Model/Mysql4/Store/Collection.php +4 -4
  1395. app/code/core/Mage/Core/Model/Mysql4/Store/Group.php +4 -4
  1396. app/code/core/Mage/Core/Model/Mysql4/Store/Group/Collection.php +4 -4
  1397. app/code/core/Mage/Core/Model/Mysql4/Translate.php +4 -4
  1398. app/code/core/Mage/Core/Model/Mysql4/Translate/String.php +4 -4
  1399. app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite.php +4 -4
  1400. app/code/core/Mage/Core/Model/Mysql4/Url/Rewrite/Collection.php +4 -4
  1401. app/code/core/Mage/Core/Model/Mysql4/Variable.php +4 -4
  1402. app/code/core/Mage/Core/Model/Mysql4/Variable/Collection.php +4 -4
  1403. app/code/core/Mage/Core/Model/Mysql4/Website.php +4 -4
  1404. app/code/core/Mage/Core/Model/Mysql4/Website/Collection.php +4 -4
  1405. app/code/core/Mage/Core/Model/Observer.php +4 -4
  1406. app/code/core/Mage/Core/Model/Resource.php +14 -4
  1407. app/code/core/Mage/Core/Model/Resource/Abstract.php +10 -4
  1408. app/code/core/Mage/Core/Model/Resource/Cache.php +4 -4
  1409. app/code/core/Mage/Core/Model/Resource/Config.php +4 -4
  1410. app/code/core/Mage/Core/Model/Resource/Config/Data.php +4 -4
  1411. app/code/core/Mage/Core/Model/Resource/Config/Data/Collection.php +4 -4
  1412. app/code/core/Mage/Core/Model/Resource/Db/Abstract.php +4 -4
  1413. app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php +4 -4
  1414. app/code/core/Mage/Core/Model/Resource/Design.php +4 -4
  1415. app/code/core/Mage/Core/Model/Resource/Design/Collection.php +4 -4
  1416. app/code/core/Mage/Core/Model/Resource/Design/Package/Collection.php +4 -4
  1417. app/code/core/Mage/Core/Model/Resource/Email/Queue.php +195 -0
  1418. app/code/core/Mage/Core/Model/Resource/Email/Queue/Collection.php +67 -0
  1419. app/code/core/Mage/Core/Model/Resource/Email/Template.php +4 -4
  1420. app/code/core/Mage/Core/Model/Resource/Email/Template/Collection.php +4 -4
  1421. app/code/core/Mage/Core/Model/Resource/Entity/Abstract.php +4 -4
  1422. app/code/core/Mage/Core/Model/Resource/Entity/Table.php +4 -4
  1423. app/code/core/Mage/Core/Model/Resource/File/Storage/Abstract.php +4 -4
  1424. app/code/core/Mage/Core/Model/Resource/File/Storage/Database.php +5 -5
  1425. app/code/core/Mage/Core/Model/Resource/File/Storage/Directory/Database.php +4 -4
  1426. app/code/core/Mage/Core/Model/Resource/File/Storage/File.php +4 -4
  1427. app/code/core/Mage/Core/Model/Resource/Flag.php +4 -4
  1428. app/code/core/Mage/Core/Model/Resource/Helper/Abstract.php +4 -4
  1429. app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php +4 -4
  1430. app/code/core/Mage/Core/Model/Resource/Iterator.php +4 -4
  1431. app/code/core/Mage/Core/Model/Resource/Language.php +4 -4
  1432. app/code/core/Mage/Core/Model/Resource/Language/Collection.php +4 -4
  1433. app/code/core/Mage/Core/Model/Resource/Layout.php +4 -4
  1434. app/code/core/Mage/Core/Model/Resource/Resource.php +4 -4
  1435. app/code/core/Mage/Core/Model/Resource/Session.php +4 -4
  1436. app/code/core/Mage/Core/Model/Resource/Setup.php +4 -4
  1437. app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php +4 -4
  1438. app/code/core/Mage/Core/Model/Resource/Store.php +4 -4
  1439. app/code/core/Mage/Core/Model/Resource/Store/Collection.php +4 -4
  1440. app/code/core/Mage/Core/Model/Resource/Store/Group.php +4 -4
  1441. app/code/core/Mage/Core/Model/Resource/Store/Group/Collection.php +4 -4
  1442. app/code/core/Mage/Core/Model/Resource/Transaction.php +4 -4
  1443. app/code/core/Mage/Core/Model/Resource/Translate.php +4 -4
  1444. app/code/core/Mage/Core/Model/Resource/Translate/String.php +4 -4
  1445. app/code/core/Mage/Core/Model/Resource/Type/Abstract.php +4 -4
  1446. app/code/core/Mage/Core/Model/Resource/Type/Db.php +4 -4
  1447. app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli.php +4 -4
  1448. app/code/core/Mage/Core/Model/Resource/Type/Db/Mysqli/Setup.php +4 -4
  1449. app/code/core/Mage/Core/Model/Resource/Type/Db/Pdo/Mysql.php +4 -4
  1450. app/code/core/Mage/Core/Model/Resource/Url/Rewrite.php +6 -6
  1451. app/code/core/Mage/Core/Model/Resource/Url/Rewrite/Collection.php +4 -4
  1452. app/code/core/Mage/Core/Model/Resource/Variable.php +4 -4
  1453. app/code/core/Mage/Core/Model/Resource/Variable/Collection.php +4 -4
  1454. app/code/core/Mage/Core/Model/Resource/Website.php +4 -4
  1455. app/code/core/Mage/Core/Model/Resource/Website/Collection.php +4 -4
  1456. app/code/core/Mage/Core/Model/Session.php +4 -4
  1457. app/code/core/Mage/Core/Model/Session/Abstract.php +5 -5
  1458. app/code/core/Mage/Core/Model/Session/Abstract/Varien.php +58 -4