Mage_Core_Adminhtml - Version 1.9.1.0

Version Notes

1.9.1.0

Download this release

Release Info

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


Code changes from version 1.9.0.0 to 1.9.1.0

Files changed (739) hide show
  1. app/code/core/Mage/Adminhtml/Block/Abstract.php +4 -4
  2. app/code/core/Mage/Adminhtml/Block/Api/Buttons.php +4 -4
  3. app/code/core/Mage/Adminhtml/Block/Api/Editroles.php +4 -4
  4. app/code/core/Mage/Adminhtml/Block/Api/Edituser.php +4 -4
  5. app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php +4 -4
  6. app/code/core/Mage/Adminhtml/Block/Api/Role.php +4 -4
  7. app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php +4 -4
  8. app/code/core/Mage/Adminhtml/Block/Api/Roles.php +4 -4
  9. app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php +13 -4
  10. app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php +4 -4
  11. app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php +4 -4
  12. app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php +4 -4
  13. app/code/core/Mage/Adminhtml/Block/Api/User.php +4 -4
  14. app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php +4 -4
  15. app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php +4 -4
  16. app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php +19 -11
  17. app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php +4 -4
  18. app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php +4 -4
  19. app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php +4 -4
  20. app/code/core/Mage/Adminhtml/Block/Api/Users.php +4 -4
  21. app/code/core/Mage/Adminhtml/Block/Backup.php +4 -4
  22. app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php +4 -4
  23. app/code/core/Mage/Adminhtml/Block/Backup/Grid.php +4 -4
  24. app/code/core/Mage/Adminhtml/Block/Cache.php +4 -4
  25. app/code/core/Mage/Adminhtml/Block/Cache/Additional.php +9 -4
  26. app/code/core/Mage/Adminhtml/Block/Cache/Grid.php +4 -4
  27. app/code/core/Mage/Adminhtml/Block/Cache/Notifications.php +4 -4
  28. app/code/core/Mage/Adminhtml/Block/Catalog.php +4 -4
  29. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php +4 -4
  30. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php +4 -4
  31. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php +4 -4
  32. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php +4 -4
  33. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php +4 -4
  34. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php +4 -4
  35. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php +4 -4
  36. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php +4 -4
  37. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php +4 -4
  38. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php +4 -4
  39. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php +4 -4
  40. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php +4 -4
  41. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php +4 -4
  42. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php +4 -4
  43. app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php +29 -7
  44. app/code/core/Mage/Adminhtml/Block/Catalog/Form.php +4 -4
  45. app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php +4 -4
  46. app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php +4 -4
  47. app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php +4 -4
  48. app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php +4 -4
  49. app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php +4 -4
  50. app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php +4 -4
  51. app/code/core/Mage/Adminhtml/Block/Catalog/Product.php +4 -4
  52. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php +4 -4
  53. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php +4 -4
  54. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php +4 -4
  55. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php +4 -4
  56. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php +4 -4
  57. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php +4 -4
  58. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php +4 -4
  59. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php +4 -4
  60. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php +4 -4
  61. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php +4 -4
  62. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php +4 -4
  63. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php +4 -4
  64. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php +4 -4
  65. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php +4 -4
  66. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php +4 -4
  67. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php +4 -4
  68. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php +4 -4
  69. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php +4 -4
  70. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php +4 -4
  71. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php +4 -4
  72. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php +4 -4
  73. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php +4 -4
  74. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Error.php +4 -4
  75. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php +4 -4
  76. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php +4 -4
  77. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php +4 -4
  78. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php +4 -4
  79. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php +4 -4
  80. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Update/Result.php +4 -4
  81. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php +4 -4
  82. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php +4 -4
  83. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php +4 -4
  84. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php +4 -4
  85. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php +4 -4
  86. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php +4 -4
  87. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php +4 -4
  88. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Js.php +4 -4
  89. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php +4 -4
  90. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php +4 -4
  91. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php +4 -4
  92. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php +4 -4
  93. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php +4 -4
  94. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php +4 -4
  95. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php +4 -4
  96. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php +4 -4
  97. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php +4 -4
  98. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php +4 -4
  99. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php +4 -4
  100. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php +4 -4
  101. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php +4 -4
  102. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php +4 -4
  103. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php +4 -4
  104. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php +4 -4
  105. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php +4 -4
  106. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php +4 -4
  107. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php +4 -4
  108. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Recurring.php +4 -4
  109. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php +4 -4
  110. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php +4 -4
  111. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Reviews.php +4 -4
  112. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Settings.php +4 -4
  113. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php +4 -4
  114. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php +4 -4
  115. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php +4 -4
  116. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php +4 -4
  117. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php +4 -4
  118. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php +4 -4
  119. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php +4 -4
  120. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php +4 -4
  121. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag.php +4 -4
  122. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php +4 -4
  123. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php +4 -4
  124. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php +4 -4
  125. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php +4 -4
  126. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php +4 -4
  127. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php +4 -4
  128. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php +4 -4
  129. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php +4 -4
  130. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php +4 -4
  131. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php +4 -4
  132. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Config.php +4 -4
  133. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php +4 -4
  134. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php +4 -4
  135. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php +4 -4
  136. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php +4 -4
  137. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Price.php +4 -4
  138. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php +4 -4
  139. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php +4 -4
  140. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Price.php +4 -4
  141. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php +4 -4
  142. app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser/Container.php +4 -4
  143. app/code/core/Mage/Adminhtml/Block/Catalog/Search.php +4 -4
  144. app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php +4 -4
  145. app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php +4 -4
  146. app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php +4 -4
  147. app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php +4 -4
  148. app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php +4 -4
  149. app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php +4 -4
  150. app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php +4 -4
  151. app/code/core/Mage/Adminhtml/Block/Cms/Block.php +4 -4
  152. app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php +4 -4
  153. app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php +4 -4
  154. app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php +4 -4
  155. app/code/core/Mage/Adminhtml/Block/Cms/Block/Widget/Chooser.php +4 -4
  156. app/code/core/Mage/Adminhtml/Block/Cms/Page.php +4 -4
  157. app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php +4 -4
  158. app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php +4 -4
  159. app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Content.php +4 -4
  160. app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php +4 -4
  161. app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php +4 -4
  162. app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php +4 -4
  163. app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php +4 -4
  164. app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php +4 -4
  165. app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php +4 -4
  166. app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php +4 -4
  167. app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php +4 -4
  168. app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php +4 -4
  169. app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Newfolder.php +4 -4
  170. app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php +4 -4
  171. app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php +4 -4
  172. app/code/core/Mage/Adminhtml/Block/Customer.php +4 -4
  173. app/code/core/Mage/Adminhtml/Block/Customer/Edit.php +4 -4
  174. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php +4 -4
  175. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Adminpass.php +91 -0
  176. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Attribute/Group.php +4 -4
  177. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php +4 -4
  178. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php +4 -4
  179. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php +16 -4
  180. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php +4 -4
  181. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php +4 -4
  182. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php +4 -4
  183. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php +4 -4
  184. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php +4 -4
  185. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php +4 -4
  186. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php +4 -4
  187. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php +4 -4
  188. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php +4 -4
  189. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php +4 -4
  190. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php +4 -4
  191. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.php +4 -4
  192. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php +4 -4
  193. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php +4 -4
  194. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php +4 -4
  195. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php +4 -4
  196. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php +4 -4
  197. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php +4 -4
  198. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php +4 -4
  199. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist.php +4 -4
  200. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php +4 -4
  201. app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php +4 -4
  202. app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Boolean.php +4 -4
  203. app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php +4 -4
  204. app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php +4 -4
  205. app/code/core/Mage/Adminhtml/Block/Customer/Grid.php +4 -4
  206. app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php +4 -4
  207. app/code/core/Mage/Adminhtml/Block/Customer/Grid/Renderer/Multiaction.php +4 -4
  208. app/code/core/Mage/Adminhtml/Block/Customer/Group.php +4 -4
  209. app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php +4 -4
  210. app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php +4 -4
  211. app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php +4 -4
  212. app/code/core/Mage/Adminhtml/Block/Customer/Online.php +4 -4
  213. app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php +4 -4
  214. app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php +4 -4
  215. app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php +4 -4
  216. app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php +4 -4
  217. app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php +4 -4
  218. app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php +4 -4
  219. app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php +4 -4
  220. app/code/core/Mage/Adminhtml/Block/Dashboard.php +4 -4
  221. app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php +4 -4
  222. app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php +4 -4
  223. app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php +4 -4
  224. app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php +5 -5
  225. app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php +4 -4
  226. app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php +4 -4
  227. app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php +4 -4
  228. app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php +4 -4
  229. app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php +4 -4
  230. app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php +4 -4
  231. app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php +4 -4
  232. app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php +4 -4
  233. app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php +4 -4
  234. app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php +4 -4
  235. app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php +4 -4
  236. app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php +4 -4
  237. app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php +4 -4
  238. app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php +4 -4
  239. app/code/core/Mage/Adminhtml/Block/Denied.php +4 -4
  240. app/code/core/Mage/Adminhtml/Block/Html/Date.php +4 -4
  241. app/code/core/Mage/Adminhtml/Block/Html/Select.php +4 -4
  242. app/code/core/Mage/Adminhtml/Block/Media/Editor.php +4 -4
  243. app/code/core/Mage/Adminhtml/Block/Media/Uploader.php +4 -4
  244. app/code/core/Mage/Adminhtml/Block/Messages.php +4 -4
  245. app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php +4 -4
  246. app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php +4 -4
  247. app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php +4 -4
  248. app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php +4 -4
  249. app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php +4 -4
  250. app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php +4 -4
  251. app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php +4 -4
  252. app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php +4 -4
  253. app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php +4 -4
  254. app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php +4 -4
  255. app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview/Form.php +4 -4
  256. app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php +4 -4
  257. app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php +4 -4
  258. app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php +4 -4
  259. app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php +4 -4
  260. app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php +4 -4
  261. app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php +4 -4
  262. app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php +4 -4
  263. app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php +4 -4
  264. app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php +4 -4
  265. app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php +4 -4
  266. app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php +4 -4
  267. app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php +4 -4
  268. app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview/Form.php +4 -4
  269. app/code/core/Mage/Adminhtml/Block/Notification/Baseurl.php +4 -4
  270. app/code/core/Mage/Adminhtml/Block/Notification/Grid.php +4 -4
  271. app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Actions.php +4 -4
  272. app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php +4 -4
  273. app/code/core/Mage/Adminhtml/Block/Notification/Grid/Renderer/Severity.php +4 -4
  274. app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php +4 -4
  275. app/code/core/Mage/Adminhtml/Block/Notification/Security.php +4 -4
  276. app/code/core/Mage/Adminhtml/Block/Notification/Survey.php +4 -4
  277. app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php +4 -4
  278. app/code/core/Mage/Adminhtml/Block/Notification/Window.php +4 -4
  279. app/code/core/Mage/Adminhtml/Block/Page.php +4 -4
  280. app/code/core/Mage/Adminhtml/Block/Page/Footer.php +4 -4
  281. app/code/core/Mage/Adminhtml/Block/Page/Head.php +4 -4
  282. app/code/core/Mage/Adminhtml/Block/Page/Header.php +4 -4
  283. app/code/core/Mage/Adminhtml/Block/Page/Menu.php +4 -4
  284. app/code/core/Mage/Adminhtml/Block/Page/Notices.php +4 -4
  285. app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php +4 -4
  286. app/code/core/Mage/Adminhtml/Block/Permissions/Editroles.php +4 -4
  287. app/code/core/Mage/Adminhtml/Block/Permissions/Edituser.php +4 -4
  288. app/code/core/Mage/Adminhtml/Block/Permissions/Grid/Role.php +4 -4
  289. app/code/core/Mage/Adminhtml/Block/Permissions/Grid/User.php +4 -4
  290. app/code/core/Mage/Adminhtml/Block/Permissions/Role.php +4 -4
  291. app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php +4 -4
  292. app/code/core/Mage/Adminhtml/Block/Permissions/Roles.php +4 -4
  293. app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Roleinfo.php +15 -5
  294. app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php +4 -4
  295. app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesusers.php +4 -4
  296. app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Useredit.php +4 -4
  297. app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Userroles.php +4 -4
  298. app/code/core/Mage/Adminhtml/Block/Permissions/User.php +4 -4
  299. app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit.php +4 -4
  300. app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Form.php +4 -4
  301. app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Main.php +20 -11
  302. app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tab/Roles.php +4 -4
  303. app/code/core/Mage/Adminhtml/Block/Permissions/User/Edit/Tabs.php +4 -4
  304. app/code/core/Mage/Adminhtml/Block/Permissions/User/Grid.php +4 -4
  305. app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.php +4 -4
  306. app/code/core/Mage/Adminhtml/Block/Permissions/Users.php +4 -4
  307. app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php +4 -4
  308. app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit/Form.php +4 -4
  309. app/code/core/Mage/Adminhtml/Block/Poll/Edit.php +4 -4
  310. app/code/core/Mage/Adminhtml/Block/Poll/Edit/Form.php +4 -4
  311. app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers.php +4 -4
  312. app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Form.php +4 -4
  313. app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php +4 -4
  314. app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php +4 -4
  315. app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Form.php +4 -4
  316. app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php +4 -4
  317. app/code/core/Mage/Adminhtml/Block/Poll/Grid.php +4 -4
  318. app/code/core/Mage/Adminhtml/Block/Poll/Poll.php +4 -4
  319. app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php +4 -4
  320. app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php +4 -4
  321. app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php +4 -4
  322. app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Js.php +4 -4
  323. app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Actions.php +4 -4
  324. app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php +4 -4
  325. app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php +4 -4
  326. app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php +4 -4
  327. app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php +4 -4
  328. app/code/core/Mage/Adminhtml/Block/Promo/Quote.php +4 -4
  329. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php +4 -4
  330. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php +4 -4
  331. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php +4 -4
  332. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php +4 -4
  333. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons.php +4 -4
  334. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php +4 -4
  335. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php +4 -4
  336. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php +4 -4
  337. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Labels.php +4 -4
  338. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php +4 -4
  339. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main/Renderer/Checkbox.php +4 -4
  340. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php +4 -4
  341. app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php +4 -4
  342. app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser.php +4 -4
  343. app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Daterange.php +4 -4
  344. app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php +4 -4
  345. app/code/core/Mage/Adminhtml/Block/Rating/Edit.php +4 -4
  346. app/code/core/Mage/Adminhtml/Block/Rating/Edit/Form.php +4 -4
  347. app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php +4 -4
  348. app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Options.php +4 -4
  349. app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php +4 -4
  350. app/code/core/Mage/Adminhtml/Block/Rating/Grid.php +4 -4
  351. app/code/core/Mage/Adminhtml/Block/Rating/Rating.php +4 -4
  352. app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/MtdStart.php +4 -4
  353. app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php +4 -4
  354. app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php +4 -4
  355. app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php +4 -4
  356. app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php +4 -4
  357. app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php +4 -4
  358. app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php +4 -4
  359. app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php +4 -4
  360. app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php +4 -4
  361. app/code/core/Mage/Adminhtml/Block/Report/Grid.php +4 -4
  362. app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php +4 -4
  363. app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php +4 -4
  364. app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php +4 -4
  365. app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php +4 -4
  366. app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php +4 -4
  367. app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php +4 -4
  368. app/code/core/Mage/Adminhtml/Block/Report/Product.php +4 -4
  369. app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php +4 -4
  370. app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php +4 -4
  371. app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php +4 -4
  372. app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php +4 -4
  373. app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php +4 -4
  374. app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php +4 -4
  375. app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php +4 -4
  376. app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php +4 -4
  377. app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php +4 -4
  378. app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php +4 -4
  379. app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php +4 -4
  380. app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php +4 -4
  381. app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php +4 -4
  382. app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php +4 -4
  383. app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php +4 -4
  384. app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php +4 -4
  385. app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php +4 -4
  386. app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php +4 -4
  387. app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php +4 -4
  388. app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php +4 -4
  389. app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers.php +4 -4
  390. app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php +4 -4
  391. app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php +4 -4
  392. app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php +4 -4
  393. app/code/core/Mage/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php +4 -4
  394. app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php +4 -4
  395. app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php +4 -4
  396. app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php +4 -4
  397. app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php +4 -4
  398. app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php +4 -4
  399. app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php +4 -4
  400. app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php +4 -4
  401. app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php +4 -4
  402. app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php +4 -4
  403. app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php +4 -4
  404. app/code/core/Mage/Adminhtml/Block/Report/Search.php +4 -4
  405. app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php +4 -4
  406. app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php +4 -4
  407. app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php +4 -4
  408. app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php +4 -4
  409. app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php +4 -4
  410. app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php +4 -4
  411. app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php +4 -4
  412. app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer.php +4 -4
  413. app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail.php +4 -4
  414. app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.php +4 -4
  415. app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.php +4 -4
  416. app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular.php +4 -4
  417. app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail.php +4 -4
  418. app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php +4 -4
  419. app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.php +4 -4
  420. app/code/core/Mage/Adminhtml/Block/Report/Tag/Product.php +4 -4
  421. app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail.php +4 -4
  422. app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.php +4 -4
  423. app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.php +4 -4
  424. app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php +4 -4
  425. app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php +4 -4
  426. app/code/core/Mage/Adminhtml/Block/Review/Add.php +4 -4
  427. app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php +4 -4
  428. app/code/core/Mage/Adminhtml/Block/Review/Edit.php +4 -4
  429. app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php +4 -4
  430. app/code/core/Mage/Adminhtml/Block/Review/Grid.php +4 -4
  431. app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php +4 -4
  432. app/code/core/Mage/Adminhtml/Block/Review/Grid/Renderer/Type.php +4 -4
  433. app/code/core/Mage/Adminhtml/Block/Review/Main.php +4 -4
  434. app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php +4 -4
  435. app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php +4 -4
  436. app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php +4 -4
  437. app/code/core/Mage/Adminhtml/Block/Sales.php +4 -4
  438. app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php +4 -4
  439. app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php +4 -4
  440. app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php +4 -4
  441. app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php +4 -4
  442. app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php +4 -4
  443. app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Default.php +4 -4
  444. app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name.php +4 -4
  445. app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php +4 -4
  446. app/code/core/Mage/Adminhtml/Block/Sales/Items/Column/Qty.php +4 -4
  447. app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Configurable.php +4 -4
  448. app/code/core/Mage/Adminhtml/Block/Sales/Items/Renderer/Default.php +4 -4
  449. app/code/core/Mage/Adminhtml/Block/Sales/Order.php +4 -4
  450. app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php +4 -4
  451. app/code/core/Mage/Adminhtml/Block/Sales/Order/Address.php +4 -4
  452. app/code/core/Mage/Adminhtml/Block/Sales/Order/Address/Form.php +4 -4
  453. app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php +25 -7
  454. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php +4 -4
  455. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Abstract.php +4 -4
  456. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php +4 -4
  457. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php +4 -4
  458. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php +4 -4
  459. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Comment.php +4 -4
  460. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php +4 -4
  461. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php +4 -4
  462. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php +4 -4
  463. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php +4 -4
  464. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Data.php +4 -4
  465. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php +4 -4
  466. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php +4 -4
  467. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php +4 -4
  468. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php +4 -4
  469. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php +4 -4
  470. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php +4 -4
  471. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Header.php +4 -4
  472. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php +4 -4
  473. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php +4 -4
  474. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Load.php +4 -4
  475. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Messages.php +4 -4
  476. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php +4 -4
  477. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php +4 -4
  478. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php +4 -4
  479. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php +4 -4
  480. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Giftmessage.php +4 -4
  481. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php +4 -4
  482. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php +4 -4
  483. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php +4 -4
  484. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php +4 -4
  485. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php +4 -4
  486. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php +4 -4
  487. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php +4 -4
  488. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php +4 -4
  489. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php +4 -4
  490. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php +4 -4
  491. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php +4 -4
  492. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php +4 -4
  493. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php +4 -4
  494. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php +4 -4
  495. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php +4 -4
  496. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php +4 -4
  497. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php +4 -4
  498. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php +4 -4
  499. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php +4 -4
  500. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Discount.php +4 -4
  501. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Grandtotal.php +4 -4
  502. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php +4 -4
  503. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.php +4 -4
  504. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php +4 -4
  505. app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php +4 -4
  506. app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php +4 -4
  507. app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Adjustments.php +4 -4
  508. app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php +4 -4
  509. app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php +4 -4
  510. app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php +4 -4
  511. app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php +4 -4
  512. app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php +4 -4
  513. app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php +4 -4
  514. app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php +4 -4
  515. app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php +4 -4
  516. app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php +4 -4
  517. app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php +4 -4
  518. app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php +4 -4
  519. app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php +4 -4
  520. app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Totals.php +4 -4
  521. app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php +4 -4
  522. app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php +4 -4
  523. app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Form.php +4 -4
  524. app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View/Items.php +4 -4
  525. app/code/core/Mage/Adminhtml/Block/Sales/Order/Payment.php +4 -4
  526. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php +4 -4
  527. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php +4 -4
  528. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php +4 -4
  529. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php +4 -4
  530. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php +4 -4
  531. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php +4 -4
  532. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php +4 -4
  533. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php +4 -4
  534. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php +4 -4
  535. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Form.php +4 -4
  536. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Items.php +4 -4
  537. app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php +4 -4
  538. app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php +4 -4
  539. app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign.php +4 -4
  540. app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign/Form.php +4 -4
  541. app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit.php +4 -4
  542. app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit/Form.php +4 -4
  543. app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Grid.php +4 -4
  544. app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New.php +4 -4
  545. app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New/Form.php +4 -4
  546. app/code/core/Mage/Adminhtml/Block/Sales/Order/Totalbar.php +4 -4
  547. app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals.php +4 -4
  548. app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Item.php +4 -4
  549. app/code/core/Mage/Adminhtml/Block/Sales/Order/Totals/Tax.php +4 -4
  550. app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php +4 -4
  551. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php +4 -4
  552. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php +4 -4
  553. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php +16 -4
  554. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Info.php +4 -4
  555. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php +4 -4
  556. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php +4 -4
  557. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Messages.php +4 -4
  558. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php +4 -4
  559. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php +8 -6
  560. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php +4 -4
  561. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php +4 -4
  562. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php +4 -4
  563. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Transactions.php +4 -4
  564. app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php +4 -4
  565. app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php +4 -4
  566. app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php +4 -4
  567. app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php +4 -4
  568. app/code/core/Mage/Adminhtml/Block/Sales/Totals.php +4 -4
  569. app/code/core/Mage/Adminhtml/Block/Sales/Transactions.php +4 -4
  570. app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php +4 -4
  571. app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail.php +8 -5
  572. app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php +4 -4
  573. app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php +4 -4
  574. app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php +4 -4
  575. app/code/core/Mage/Adminhtml/Block/Sitemap.php +4 -4
  576. app/code/core/Mage/Adminhtml/Block/Sitemap/Edit.php +4 -4
  577. app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php +4 -4
  578. app/code/core/Mage/Adminhtml/Block/Sitemap/Grid.php +4 -4
  579. app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php +4 -4
  580. app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php +4 -4
  581. app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php +4 -4
  582. app/code/core/Mage/Adminhtml/Block/Store/Switcher.php +4 -4
  583. app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset.php +4 -4
  584. app/code/core/Mage/Adminhtml/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php +4 -4
  585. app/code/core/Mage/Adminhtml/Block/System/Account/Edit.php +4 -4
  586. app/code/core/Mage/Adminhtml/Block/System/Account/Edit/Form.php +12 -4
  587. app/code/core/Mage/Adminhtml/Block/System/Cache/Edit.php +4 -4
  588. app/code/core/Mage/Adminhtml/Block/System/Cache/Form.php +4 -4
  589. app/code/core/Mage/Adminhtml/Block/System/Config/Dwstree.php +4 -4
  590. app/code/core/Mage/Adminhtml/Block/System/Config/Edit.php +4 -4
  591. app/code/core/Mage/Adminhtml/Block/System/Config/Form.php +4 -4
  592. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php +16 -9
  593. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php +4 -4
  594. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Datetime.php +4 -4
  595. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Export.php +4 -4
  596. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/File.php +4 -4
  597. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Heading.php +4 -4
  598. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Image.php +4 -4
  599. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Import.php +4 -4
  600. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Notification.php +4 -4
  601. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Regexceptions.php +4 -4
  602. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Allowspecific.php +4 -4
  603. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatcatalog.php +4 -4
  604. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Select/Flatproduct.php +4 -4
  605. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php +4 -4
  606. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php +4 -4
  607. app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset/Order/Statuses.php +4 -4
  608. app/code/core/Mage/Adminhtml/Block/System/Config/Switcher.php +4 -4
  609. app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php +4 -4
  610. app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php +4 -4
  611. app/code/core/Mage/Adminhtml/Block/System/Convert/Gui.php +4 -4
  612. app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit.php +4 -4
  613. app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Form.php +4 -4
  614. app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Upload.php +4 -4
  615. app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/View.php +4 -4
  616. app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php +4 -4
  617. app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tabs.php +4 -4
  618. app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Grid.php +4 -4
  619. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile.php +4 -4
  620. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit.php +4 -4
  621. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Filter/Action.php +4 -4
  622. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Form.php +4 -4
  623. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Renderer/Action.php +4 -4
  624. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Edit.php +4 -4
  625. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/History.php +4 -4
  626. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/Run.php +4 -4
  627. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tabs.php +4 -4
  628. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Grid.php +4 -4
  629. app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php +4 -4
  630. app/code/core/Mage/Adminhtml/Block/System/Currency.php +4 -4
  631. app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Form.php +4 -4
  632. app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Main.php +4 -4
  633. app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tab/Rates.php +4 -4
  634. app/code/core/Mage/Adminhtml/Block/System/Currency/Edit/Tabs.php +4 -4
  635. app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php +4 -4
  636. app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Services.php +4 -4
  637. app/code/core/Mage/Adminhtml/Block/System/Design.php +4 -4
  638. app/code/core/Mage/Adminhtml/Block/System/Design/Edit.php +4 -4
  639. app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php +4 -4
  640. app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tabs.php +4 -4
  641. app/code/core/Mage/Adminhtml/Block/System/Design/Grid.php +4 -4
  642. app/code/core/Mage/Adminhtml/Block/System/Email/Template.php +4 -4
  643. app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php +4 -4
  644. app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit/Form.php +4 -4
  645. app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid.php +4 -4
  646. app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php +4 -4
  647. app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php +4 -4
  648. app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Sender.php +4 -4
  649. app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Renderer/Type.php +4 -4
  650. app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php +14 -4
  651. app/code/core/Mage/Adminhtml/Block/System/Store/Delete.php +4 -4
  652. app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Form.php +4 -4
  653. app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Group.php +4 -4
  654. app/code/core/Mage/Adminhtml/Block/System/Store/Delete/Website.php +4 -4
  655. app/code/core/Mage/Adminhtml/Block/System/Store/Edit.php +4 -4
  656. app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php +4 -4
  657. app/code/core/Mage/Adminhtml/Block/System/Store/Grid.php +4 -4
  658. app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php +4 -4
  659. app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php +4 -4
  660. app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php +4 -4
  661. app/code/core/Mage/Adminhtml/Block/System/Store/Store.php +4 -4
  662. app/code/core/Mage/Adminhtml/Block/System/Store/Tree.php +4 -4
  663. app/code/core/Mage/Adminhtml/Block/System/Variable.php +4 -4
  664. app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php +4 -4
  665. app/code/core/Mage/Adminhtml/Block/System/Variable/Edit/Form.php +4 -4
  666. app/code/core/Mage/Adminhtml/Block/System/Variable/Grid.php +4 -4
  667. app/code/core/Mage/Adminhtml/Block/Tag.php +4 -4
  668. app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php +4 -4
  669. app/code/core/Mage/Adminhtml/Block/Tag/Customer.php +4 -4
  670. app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php +4 -4
  671. app/code/core/Mage/Adminhtml/Block/Tag/Edit.php +4 -4
  672. app/code/core/Mage/Adminhtml/Block/Tag/Edit/Accordion.php +4 -4
  673. app/code/core/Mage/Adminhtml/Block/Tag/Edit/Assigned.php +4 -4
  674. app/code/core/Mage/Adminhtml/Block/Tag/Edit/Form.php +4 -4
  675. app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php +4 -4
  676. app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php +4 -4
  677. app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php +4 -4
  678. app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php +4 -4
  679. app/code/core/Mage/Adminhtml/Block/Tag/Pending.php +4 -4
  680. app/code/core/Mage/Adminhtml/Block/Tag/Product.php +4 -4
  681. app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php +4 -4
  682. app/code/core/Mage/Adminhtml/Block/Tag/Store/Switcher.php +4 -4
  683. app/code/core/Mage/Adminhtml/Block/Tag/Tag.php +4 -4
  684. app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php +4 -4
  685. app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit/Form.php +4 -4
  686. app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php +4 -4
  687. app/code/core/Mage/Adminhtml/Block/Tax/Class.php +4 -4
  688. app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit.php +4 -4
  689. app/code/core/Mage/Adminhtml/Block/Tax/Class/Edit/Form.php +4 -4
  690. app/code/core/Mage/Adminhtml/Block/Tax/Class/Grid.php +4 -4
  691. app/code/core/Mage/Adminhtml/Block/Tax/Rate/Form.php +5 -4
  692. app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid.php +4 -4
  693. app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php +4 -4
  694. app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php +4 -4
  695. app/code/core/Mage/Adminhtml/Block/Tax/Rate/ImportExport.php +4 -4
  696. app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title.php +4 -4
  697. app/code/core/Mage/Adminhtml/Block/Tax/Rate/Title/Fieldset.php +4 -4
  698. app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Add.php +4 -4
  699. app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php +4 -4
  700. app/code/core/Mage/Adminhtml/Block/Tax/Rule.php +4 -4
  701. app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit.php +4 -4
  702. app/code/core/Mage/Adminhtml/Block/Tax/Rule/Edit/Form.php +4 -4
  703. app/code/core/Mage/Adminhtml/Block/Tax/Rule/Grid.php +4 -4
  704. app/code/core/Mage/Adminhtml/Block/Template.php +4 -4
  705. app/code/core/Mage/Adminhtml/Block/Text/List.php +4 -4
  706. app/code/core/Mage/Adminhtml/Block/Urlrewrite.php +4 -4
  707. app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php +4 -4
  708. app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php +4 -4
  709. app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php +4 -4
  710. app/code/core/Mage/Adminhtml/Block/Urlrewrite/Grid.php +4 -4
  711. app/code/core/Mage/Adminhtml/Block/Urlrewrite/Link.php +4 -4
  712. app/code/core/Mage/Adminhtml/Block/Urlrewrite/Product/Grid.php +4 -4
  713. app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php +4 -4
  714. app/code/core/Mage/Adminhtml/Block/Widget.php +4 -4
  715. app/code/core/Mage/Adminhtml/Block/Widget/Accordion.php +4 -4
  716. app/code/core/Mage/Adminhtml/Block/Widget/Accordion/Item.php +4 -4
  717. app/code/core/Mage/Adminhtml/Block/Widget/Breadcrumbs.php +4 -4
  718. app/code/core/Mage/Adminhtml/Block/Widget/Button.php +4 -4
  719. app/code/core/Mage/Adminhtml/Block/Widget/Container.php +4 -4
  720. app/code/core/Mage/Adminhtml/Block/Widget/Form.php +4 -4
  721. app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php +4 -4
  722. app/code/core/Mage/Adminhtml/Block/Widget/Form/Element.php +4 -4
  723. app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Dependence.php +4 -4
  724. app/code/core/Mage/Adminhtml/Block/Widget/Form/Element/Gallery.php +4 -4
  725. app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Element.php +4 -4
  726. app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset.php +4 -4
  727. app/code/core/Mage/Adminhtml/Block/Widget/Form/Renderer/Fieldset/Element.php +4 -4
  728. app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +4 -4
  729. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php +4 -4
  730. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php +4 -4
  731. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Abstract.php +4 -4
  732. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php +4 -4
  733. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Country.php +4 -4
  734. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php +4 -4
  735. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php +4 -4
  736. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Interface.php +4 -4
  737. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Massaction.php +4 -4
  738. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php +4 -4
  739. app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Radio.php +2 -2
app/code/core/Mage/Adminhtml/Block/Abstract.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
app/code/core/Mage/Adminhtml/Block/Api/Buttons.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Api_Buttons extends Mage_Adminhtml_Block_Template
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Api_Buttons extends Mage_Adminhtml_Block_Template
app/code/core/Mage/Adminhtml/Block/Api/Editroles.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Api_Editroles extends Mage_Adminhtml_Block_Widget_Tabs {
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Api_Editroles extends Mage_Adminhtml_Block_Widget_Tabs {
app/code/core/Mage/Adminhtml/Block/Api/Edituser.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Api_Edituser extends Mage_Adminhtml_Block_Widget_Tabs {
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Api_Edituser extends Mage_Adminhtml_Block_Widget_Tabs {
app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
app/code/core/Mage/Adminhtml/Block/Api/Role.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
app/code/core/Mage/Adminhtml/Block/Api/Roles.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
@@ -59,6 +59,15 @@ class Mage_Adminhtml_Block_Api_Tab_Roleinfo extends Mage_Adminhtml_Block_Widget_
59
  )
60
  );
61
 
 
 
 
 
 
 
 
 
 
62
  $fieldset->addField('role_id', 'hidden',
63
  array(
64
  'name' => 'role_id',
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
59
  )
60
  );
61
 
62
+ $fieldset->addField('current_password', 'obscure',
63
+ array(
64
+ 'name' => 'current_password',
65
+ 'label' => Mage::helper('adminhtml')->__('Current Admin Password'),
66
+ 'title' => Mage::helper('adminhtml')->__('Current Admin Password'),
67
+ 'required' => true
68
+ )
69
+ );
70
+
71
  $fieldset->addField('role_id', 'hidden',
72
  array(
73
  'name' => 'role_id',
app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Api_Tab_Rolesedit extends Mage_Adminhtml_Block_Widget_Form {
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Api_Tab_Rolesedit extends Mage_Adminhtml_Block_Widget_Form {
app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Api_Tab_Rolesusers extends Mage_Adminhtml_Block_Widget_Tabs {
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Api_Tab_Rolesusers extends Mage_Adminhtml_Block_Widget_Tabs {
app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Mage_Adminhtml_Block_Api_Tab_Userroles extends Mage_Adminhtml_Block_Widget_Tabs
27
  {
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
  class Mage_Adminhtml_Block_Api_Tab_Userroles extends Mage_Adminhtml_Block_Widget_Tabs
27
  {
app/code/core/Mage/Adminhtml/Block/Api/User.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Form.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Main.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
@@ -88,6 +88,14 @@ class Mage_Adminhtml_Block_Api_User_Edit_Tab_Main extends Mage_Adminhtml_Block_W
88
  'required' => true,
89
  ));
90
 
 
 
 
 
 
 
 
 
91
  if ($model->getUserId()) {
92
  $fieldset->addField('password', 'password', array(
93
  'name' => 'new_api_key',
@@ -125,13 +133,13 @@ class Mage_Adminhtml_Block_Api_User_Edit_Tab_Main extends Mage_Adminhtml_Block_W
125
 
126
  if (Mage::getSingleton('admin/session')->getUser()->getId() != $model->getUserId()) {
127
  $fieldset->addField('is_active', 'select', array(
128
- 'name' => 'is_active',
129
- 'label' => Mage::helper('adminhtml')->__('This account is'),
130
- 'id' => 'is_active',
131
- 'title' => Mage::helper('adminhtml')->__('Account status'),
132
- 'class' => 'input-select',
133
- 'style' => 'width: 80px',
134
- 'options' => array('1' => Mage::helper('adminhtml')->__('Active'), '0' => Mage::helper('adminhtml')->__('Inactive')),
135
  ));
136
  }
137
 
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
88
  'required' => true,
89
  ));
90
 
91
+ $fieldset->addField('current_password', 'obscure', array(
92
+ 'name' => 'current_password',
93
+ 'label' => Mage::helper('adminhtml')->__('Current Admin Password'),
94
+ 'title' => Mage::helper('adminhtml')->__('Current Admin Password'),
95
+ 'required' => true,
96
+ )
97
+ );
98
+
99
  if ($model->getUserId()) {
100
  $fieldset->addField('password', 'password', array(
101
  'name' => 'new_api_key',
133
 
134
  if (Mage::getSingleton('admin/session')->getUser()->getId() != $model->getUserId()) {
135
  $fieldset->addField('is_active', 'select', array(
136
+ 'name' => 'is_active',
137
+ 'label' => Mage::helper('adminhtml')->__('This account is'),
138
+ 'id' => 'is_active',
139
+ 'title' => Mage::helper('adminhtml')->__('Account status'),
140
+ 'class' => 'input-select',
141
+ 'style' => 'width: 80px',
142
+ 'options' => array('1' => Mage::helper('adminhtml')->__('Active'), '0' => Mage::helper('adminhtml')->__('Inactive')),
143
  ));
144
  }
145
 
app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Api_User_Edit_Tab_Roles extends Mage_Adminhtml_Block_Widget_Grid
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Api_User_Edit_Tab_Roles extends Mage_Adminhtml_Block_Widget_Grid
app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
app/code/core/Mage/Adminhtml/Block/Api/Users.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
app/code/core/Mage/Adminhtml/Block/Backup.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
app/code/core/Mage/Adminhtml/Block/Backup/Grid.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
app/code/core/Mage/Adminhtml/Block/Cache.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Cache extends Mage_Adminhtml_Block_Widget_Grid_Container
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Cache extends Mage_Adminhtml_Block_Widget_Grid_Container
app/code/core/Mage/Adminhtml/Block/Cache/Additional.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Cache_Additional extends Mage_Adminhtml_Block_Template
@@ -31,6 +31,11 @@ class Mage_Adminhtml_Block_Cache_Additional extends Mage_Adminhtml_Block_Templat
31
  return $this->getUrl('*/*/cleanImages');
32
  }
33
 
 
 
 
 
 
34
  public function getCleanMediaUrl()
35
  {
36
  return $this->getUrl('*/*/cleanMedia');
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Cache_Additional extends Mage_Adminhtml_Block_Template
31
  return $this->getUrl('*/*/cleanImages');
32
  }
33
 
34
+ public function getCleanSwatchesUrl()
35
+ {
36
+ return $this->getUrl('*/*/cleanSwatches');
37
+ }
38
+
39
  public function getCleanMediaUrl()
40
  {
41
  return $this->getUrl('*/*/cleanMedia');
app/code/core/Mage/Adminhtml/Block/Cache/Grid.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Cache_Grid extends Mage_Adminhtml_Block_Widget_Grid
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Cache_Grid extends Mage_Adminhtml_Block_Widget_Grid
app/code/core/Mage/Adminhtml/Block/Cache/Notifications.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Cache_Notifications extends Mage_Adminhtml_Block_Template
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  class Mage_Adminhtml_Block_Cache_Notifications extends Mage_Adminhtml_Block_Template
app/code/core/Mage/Adminhtml/Block/Catalog.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php CHANGED
@@ -10,18 +10,18 @@
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**
10
  * http://opensource.org/licenses/osl-3.0.php
11
  * If you did not receive a copy of the license and are unable to
12
  * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
  *
15
  * DISCLAIMER
16
  *
17
  * Do not edit or add to this file if you wish to upgrade Magento to newer
18
  * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
  *
21
  * @category Mage
22
  * @package Mage_Adminhtml
23
+ * @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
  */
26
 
27
  /**