Skip to content
Browse files

2.0.0.0-dev38

* Changed application initialization procedure
  * Application can be started with specific initial configuration data. `Mage_Core_Model_Config::loadBase()` merges this configuration with the highest priority
  * `Mage` class is no longer responsible for application installation status. `Mage_Core_Model_App` has this responsibility (`Mage_Core_Model_App::isInstalled()`)
* Implemented new library component `Magento_Filesystem` for working with file system
  * New component has more abstract layer of interaction with file system, better path isolation
  * Introduced interface Magento_Filesystem_AdapterInterface for file operations. Added concrete implementation in `Magento_Filesystem_Adapter_Local`
  * Introduced interface Magento_Filesystem_StreamInterface for stream operations with content. Added concrete implementation in `Magento_Filesystem_Stream_Local`
  * Added special class `Magento_Filesystem_Stream_Mode` to set parameters of stream on opening (read-only, write-only etc.)
* Added an ability to skip some service functions for lighter launch of application in `app/bootstrap.php`
* Improved batch tool for launching automated tests. Tool has an ability to run specified test types. Tool was moved from `dev/tools/batch_tests` to `dev/tools/tests.php`
* Improved integration test Mage_Adminhtml_DashboardControllerTest to skip test case when Google service is unavailable
* Improved url building process in new jQuery form widget to have it more secure
* Removed obsolete `@group module::<Namespace_Module>` annotation from integration tests, restricted its further usage
* Updated jQuery library used in application, used unified file name instead of version-based one
* Relocated XSD files for System Configuration, Menu Configuration, ACL Configuration, ACL Configuration for WebApi, Theme Configuration, View Configuration, Validator Configuration to `etc` subfolders of corresponding modules
* Bug fixes
  * Fixed bug with placing order in backend using Authorize.Net Direct Post payment method
  * Changed `Mage_Core_Model_Url` to fix bug with incorrect links on frontend (My Wishlist, Go to Shopping Cart, Continue button at first checkout step)
  * Fixed several bugs after converting backend grids to layout declaration. Changes were made in EAV Attributes, Design, Newsletter, Backup modules
  * Fixed incorrect current working directory behavior on application isolation in tests
  • Loading branch information...
1 parent fee89fe commit b7f408dbb5d533fa46d0f551e992a8b87fa78c1b @magento-team magento-team committed
Showing with 429 additions and 455 deletions.
  1. +23 −0 CHANGELOG.markdown
  2. +36 −0 CONTRIBUTING.md
  3. +19 −104 app/Mage.php
  4. +1 −1 app/autoload.php
  5. +55 −55 app/bootstrap.php
  6. +1 −1 app/code/community/Phoenix/Moneybookers/Block/Form.php
  7. +1 −1 app/code/community/Phoenix/Moneybookers/Block/Info.php
  8. +1 −1 app/code/community/Phoenix/Moneybookers/Block/Jsinit.php
  9. +1 −1 app/code/community/Phoenix/Moneybookers/Block/Payment.php
  10. +1 −1 app/code/community/Phoenix/Moneybookers/Block/Placeform.php
  11. +1 −1 app/code/community/Phoenix/Moneybookers/Block/Redirect.php
  12. +1 −1 app/code/community/Phoenix/Moneybookers/Helper/Data.php
  13. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Abstract.php
  14. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Acc.php
  15. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Csi.php
  16. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Did.php
  17. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Dnk.php
  18. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Ebt.php
  19. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Ent.php
  20. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Event.php
  21. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Gcb.php
  22. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Gir.php
  23. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Idl.php
  24. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Lsr.php
  25. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Mae.php
  26. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Npy.php
  27. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Obt.php
  28. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Pli.php
  29. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Psp.php
  30. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Pwy.php
  31. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Sft.php
  32. +1 −1 app/code/community/Phoenix/Moneybookers/Model/So2.php
  33. +1 −1 app/code/community/Phoenix/Moneybookers/Model/Wlt.php
  34. +1 −1 app/code/community/Phoenix/Moneybookers/controllers/MoneybookersController.php
  35. +1 −1 app/code/community/Phoenix/Moneybookers/controllers/ProcessingController.php
  36. +1 −1 app/code/community/Phoenix/Moneybookers/etc/adminhtml/acl.xml
  37. +1 −1 app/code/community/Phoenix/Moneybookers/etc/adminhtml/system.xml
  38. +1 −1 app/code/community/Phoenix/Moneybookers/etc/config.xml
  39. +1 −1 app/code/community/Phoenix/Moneybookers/sql/moneybookers_setup/install-1.6.0.0.php
  40. +1 −1 app/code/community/Phoenix/Moneybookers/view/adminhtml/activation.js
  41. +1 −1 app/code/community/Phoenix/Moneybookers/view/adminhtml/info.phtml
  42. +1 −1 app/code/community/Phoenix/Moneybookers/view/adminhtml/jsinit.phtml
  43. +1 −1 app/code/community/Phoenix/Moneybookers/view/adminhtml/layout.xml
  44. +1 −1 app/code/community/Phoenix/Moneybookers/view/adminhtml/pdf/info.phtml
  45. +1 −1 app/code/community/Phoenix/Moneybookers/view/frontend/blank.phtml
  46. +1 −1 app/code/community/Phoenix/Moneybookers/view/frontend/form.phtml
  47. +1 −1 app/code/community/Phoenix/Moneybookers/view/frontend/info.phtml
  48. +1 −1 app/code/community/Phoenix/Moneybookers/view/frontend/layout.xml
  49. +1 −1 app/code/community/Phoenix/Moneybookers/view/frontend/payment.phtml
  50. +1 −1 app/code/community/Phoenix/Moneybookers/view/frontend/placeform.phtml
  51. +1 −1 app/code/community/Phoenix/Moneybookers/view/frontend/redirect.phtml
  52. +1 −1 app/code/core/Mage/AdminNotification/Helper/Data.php
  53. +1 −1 app/code/core/Mage/AdminNotification/Model/Config/Source/Frequency.php
  54. +1 −1 app/code/core/Mage/AdminNotification/Model/Feed.php
  55. +1 −1 app/code/core/Mage/AdminNotification/Model/Inbox.php
  56. +1 −1 app/code/core/Mage/AdminNotification/Model/Observer.php
  57. +1 −1 app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php
  58. +1 −1 app/code/core/Mage/AdminNotification/Model/Resource/Inbox/Collection.php
  59. +1 −1 app/code/core/Mage/AdminNotification/Model/Survey.php
  60. +1 −1 app/code/core/Mage/AdminNotification/etc/adminhtml/acl.xml
  61. +1 −1 app/code/core/Mage/AdminNotification/etc/adminhtml/menu.xml
  62. +1 −1 app/code/core/Mage/AdminNotification/etc/adminhtml/system.xml
  63. +1 −1 app/code/core/Mage/AdminNotification/etc/config.xml
  64. +1 −1 app/code/core/Mage/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php
  65. +1 −1 app/code/core/Mage/Adminhtml/Block/Abstract.php
  66. +1 −1 app/code/core/Mage/Adminhtml/Block/Backup.php
  67. +1 −1 app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php
  68. +1 −1 app/code/core/Mage/Adminhtml/Block/Cache.php
  69. +1 −1 app/code/core/Mage/Adminhtml/Block/Cache/Additional.php
  70. +1 −1 app/code/core/Mage/Adminhtml/Block/Cache/Grid.php
  71. +1 −1 app/code/core/Mage/Adminhtml/Block/Cache/Notifications.php
  72. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php
  73. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php
  74. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php
  75. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
  76. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Image.php
  77. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php
  78. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php
  79. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Helper/Sortby/Default.php
  80. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php
  81. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php
  82. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php
  83. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php
  84. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php
  85. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
  86. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php
  87. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Form.php
  88. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php
  89. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php
  90. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php
  91. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php
  92. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php
  93. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php
  94. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product.php
  95. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php
  96. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php
  97. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php
  98. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php
  99. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php
  100. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php
  101. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php
  102. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php
  103. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Grid.php
  104. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Attributes.php
  105. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php
  106. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php
  107. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php
  108. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php
  109. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php
  110. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php
  111. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php
  112. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php
  113. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php
  114. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php
  115. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php
  116. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Error.php
  117. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php
  118. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php
  119. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php
  120. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php
  121. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php
  122. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Update/Result.php
  123. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php
  124. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
  125. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php
  126. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php
  127. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php
  128. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php
  129. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php
  130. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/AttributeSet.php
  131. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Js.php
  132. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/NewCategory.php
  133. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php
  134. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php
  135. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php
  136. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php
  137. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php
  138. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php
  139. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php
  140. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php
  141. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php
  142. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
  143. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Popup/Grid.php
  144. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Abstract.php
  145. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php
  146. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php
  147. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php
  148. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php
  149. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php
  150. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php
  151. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/Abstract.php
  152. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Recurring.php
  153. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php
  154. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php
  155. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Reviews.php
  156. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
  157. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php
  158. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php
  159. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php
  160. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php
  161. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php
  162. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php
  163. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php
  164. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php
  165. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php
  166. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php
  167. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php
  168. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php
  169. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php
  170. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php
  171. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/BaseImage.php
  172. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php
  173. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Category.php
  174. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Config.php
  175. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php
  176. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php
  177. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php
  178. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php
  179. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Price.php
  180. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php
  181. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php
  182. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight/Renderer.php
  183. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Options/Ajax.php
  184. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Price.php
  185. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php
  186. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser/Container.php
  187. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Search.php
  188. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php
  189. +1 −1 app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php
  190. +1 −1 app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php
  191. +1 −1 app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php
  192. +1 −1 app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php
  193. +1 −1 app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php
  194. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Block.php
  195. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php
  196. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php
  197. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php
  198. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Block/Widget/Chooser.php
  199. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Page.php
  200. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php
  201. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Form.php
  202. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Content.php
  203. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php
  204. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php
  205. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php
  206. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php
  207. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php
  208. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid/Renderer/Action.php
  209. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php
  210. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php
  211. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Files.php
  212. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Newfolder.php
  213. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php
  214. +1 −1 app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php
  215. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer.php
  216. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit.php
  217. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Form.php
  218. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Attribute/Group.php
  219. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Newpass.php
  220. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php
  221. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php
  222. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
  223. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php
  224. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Carts.php
  225. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php
  226. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php
  227. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php
  228. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php
  229. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php
  230. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php
  231. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Reviews.php
  232. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php
  233. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php
  234. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php
  235. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php
  236. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php
  237. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php
  238. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php
  239. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Wishlist/Grid/Renderer/Description.php
  240. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php
  241. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Boolean.php
  242. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php
  243. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php
  244. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Grid.php
  245. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Grid/Filter/Country.php
  246. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Grid/Renderer/Multiaction.php
  247. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Group.php
  248. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php
  249. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit/Form.php
  250. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php
  251. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Online.php
  252. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php
  253. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php
  254. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Ip.php
  255. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Type.php
  256. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid/Renderer/Url.php
  257. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php
  258. +1 −1 app/code/core/Mage/Adminhtml/Block/Customer/System/Config/Validatevat.php
  259. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard.php
  260. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php
  261. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php
  262. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php
  263. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
  264. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php
  265. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php
  266. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php
  267. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php
  268. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php
  269. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php
  270. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php
  271. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php
  272. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php
  273. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php
  274. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php
  275. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php
  276. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php
  277. +1 −1 app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php
  278. +1 −1 app/code/core/Mage/Adminhtml/Block/Denied.php
  279. +1 −1 app/code/core/Mage/Adminhtml/Block/Html/Date.php
  280. +1 −1 app/code/core/Mage/Adminhtml/Block/Html/Select.php
  281. +1 −1 app/code/core/Mage/Adminhtml/Block/Media/Uploader.php
  282. +1 −1 app/code/core/Mage/Adminhtml/Block/Messages.php
  283. +1 −1 app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php
  284. +1 −1 app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php
  285. +1 −1 app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php
  286. +1 −1 app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php
  287. +1 −1 app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
  288. +1 −1 app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit/Form.php
  289. +1 −1 app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php
  290. +1 −1 app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php
  291. +1 −1 app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php
  292. +1 −1 app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview/Form.php
  293. +1 −1 app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php
  294. +1 −1 app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php
  295. +1 −1 app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php
  296. +1 −1 app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php
  297. +1 −1 app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php
  298. +1 −1 app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php
  299. +1 −1 app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php
  300. +1 −1 app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php
Sorry, we could not display the entire diff because too many files (7,247) changed.
View
23 CHANGELOG.markdown
@@ -1,3 +1,26 @@
+2.0.0.0-dev38
+=============
+* Changed application initialization procedure
+ * Application can be started with specific initial configuration data. `Mage_Core_Model_Config::loadBase()` merges this configuration with the highest priority
+ * `Mage` class is no longer responsible for application installation status. `Mage_Core_Model_App` has this responsibility (`Mage_Core_Model_App::isInstalled()`)
+* Implemented new library component `Magento_Filesystem` for working with file system
+ * New component has more abstract layer of interaction with file system, better path isolation
+ * Introduced interface Magento_Filesystem_AdapterInterface for file operations. Added concrete implementation in `Magento_Filesystem_Adapter_Local`
+ * Introduced interface Magento_Filesystem_StreamInterface for stream operations with content. Added concrete implementation in `Magento_Filesystem_Stream_Local`
+ * Added special class `Magento_Filesystem_Stream_Mode` to set parameters of stream on opening (read-only, write-only etc.)
+* Added an ability to skip some service functions for lighter launch of application in `app/bootstrap.php`
+* Improved batch tool for launching automated tests. Tool has an ability to run specified test types. Tool was moved from `dev/tools/batch_tests` to `dev/tools/tests.php`
+* Improved integration test Mage_Adminhtml_DashboardControllerTest to skip test case when Google service is unavailable
+* Improved url building process in new jQuery form widget to have it more secure
+* Removed obsolete `@group module::<Namespace_Module>` annotation from integration tests, restricted its further usage
+* Updated jQuery library used in application, used unified file name instead of version-based one
+* Relocated XSD files for System Configuration, Menu Configuration, ACL Configuration, ACL Configuration for WebApi, Theme Configuration, View Configuration, Validator Configuration to `etc` subfolders of corresponding modules
+* Bug fixes
+ * Fixed bug with placing order in backend using Authorize.Net Direct Post payment method
+ * Changed `Mage_Core_Model_Url` to fix bug with incorrect links on frontend (My Wishlist, Go to Shopping Cart, Continue button at first checkout step)
+ * Fixed several bugs after converting backend grids to layout declaration. Changes were made in EAV Attributes, Design, Newsletter, Backup modules
+ * Fixed incorrect current working directory behavior on application isolation in tests
+
2.0.0.0-dev37
=============
* Refactored a variety of grids in backend (admin) to make them configurable through layout, rather than hard-coded. The following classes were affected (converted): `Mage_User_Block_User_Grid`, `Mage_User_Block_Role_Grid`, `Mage_Adminhtml_Block_System_Design_Grid`, `Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Grid`, `Mage_Adminhtml_Block_Newsletter_Problem_Grid`, `Mage_Adminhtml_Block_Backup_Grid`, `Mage_Adminhtml_Block_Tax_Rate_Grid`, `Mage_Adminhtml_Block_System_Store_Grid`, `Mage_Adminhtml_Block_System_Email_Template_Grid`, `Mage_Adminhtml_Block_Sitemap_Grid`, `Mage_Adminhtml_Block_Catalog_Search_Grid`, `Mage_Adminhtml_Block_Urlrewrite_Grid`, `Mage_Adminhtml_Block_System_Variable_Grid`, `Mage_Adminhtml_Block_Report_Review_Customer_Grid`, `Mage_Adminhtml_Block_Report_Review_Product_Grid`
View
36 CONTRIBUTING.md
@@ -0,0 +1,36 @@
+# Contribution Guide
+
+The Magento 2 development team will review all issues and contributions submitted by the community of developers. Contributions can take the form of new components/features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations or just good suggestions. To assist in the expediency of the review process, we strongly encourage you to follow all the proper requirements stated below in Definition of Done, before submitting any code for consideration.
+
+## Contribution Process
+
+If you are a new github user, we recommend that you create your own [free github account](https://github.com/signup/free). By doing that, you will be able to collaborate with the Magento 2 development team, “fork” the Magento 2 project and be able to easily send “pull requests”.
+
+1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
+2. Review the [Contributor License Agreement](https://github.com/magento/magento2/wiki/Contributor-License-Agreement) if this is your first time contributing.
+3. Create and test your work.
+4. Fork the Magento 2 repository according to [github's Fork A Repo instructions](https://help.github.com/articles/fork-a-repo) and when you are ready to send us a Pull Request – follow [github's Using Pull Requests instructions](https://help.github.com/articles/using-pull-requests).
+5. Once your contribution is received, Magento 2 development team will review the contribution and collaborate with you as needed to improve the quality of the contribution.
+
+### Contribution Acceptance Criteria
+
+1. Code changes must be covered with automated tests and supplied along with the patch (or fork). Author chooses the best approach for testing as deemed necessary. See [Magento Automated Testing Standard](https://github.com/magento/magento2/wiki/Magento-Automated-Testing-Standard) for additional guidance.
+2. New features or proposals must be supplied with documentation -- functional (how a feature works) or technical (how it is implemented/designed), or both.
+
+## Frequently Asked Questions
+
+**Do I need to follow all requirements of the contribution process?**
+
+Yes. We strongly encourage that you follow the requirements as stated, before submitting your code or patch for Magento 2 development team's review. Properly submitted contributions will help the Magento 2 development team to quickly assess your contribution and incorporate it into the Magento 2 project if deemed beneficial.
+
+**Do you accept all contributions?**
+
+Not all contributions will be used or incorporated into the code for the project. The decision to incorporate the code or not is at the discretion of the Magento 2 development team.
+
+# X.Commerce (Magento) Contributor License Agreement
+
+All Submissions you make to Magento, a division of X.commerce, Inc. (“Magento”) through GitHub are subject to the following terms and conditions:
+
+1. You grant Magento a perpetual, worldwide, non-exclusive, no charge, royalty free, irrevocable license under your applicable copyrights and patents to reproduce, prepare derivative works of, display, publically perform, sublicense and distribute any feedback, ideas, code, or other information (“Submission”) you submit through GitHub.
+2. Your Submission is an original work of authorship and you are the owner or are legally entitled to grant the license stated above.
+3. You agree to the X.commerce Agreement found here: [https://www.x.com/developers/x.commerce/x.commerce-user-agreement](https://www.x.com/developers/x.commerce/x.commerce-user-agreement)
View
123 app/Mage.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Core
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -100,13 +100,6 @@
public static $headersSentThrowsException = true;
/**
- * Is installed flag
- *
- * @var bool
- */
- static private $_isInstalled;
-
- /**
* Logger entities
*
* @var array
@@ -170,7 +163,7 @@ public static function getVersionInfo()
'revision' => '0',
'patch' => '0',
'stability' => 'dev',
- 'number' => '37',
+ 'number' => '38',
);
}
@@ -200,7 +193,6 @@ public static function reset()
self::$_objects = null;
self::$_isDownloader = false;
self::$_isDeveloperMode = false;
- self::$_isInstalled = null;
self::$_loggers = array();
self::$_design = null;
// do not reset $headersSentThrowsException
@@ -268,38 +260,20 @@ public static function registry($key)
}
/**
- * Set application root absolute path
- *
- * @param string $appRoot
- * @throws Mage_Core_Exception
- */
- public static function setRoot($appRoot = '')
- {
- if (self::$_appRoot) {
- return ;
- }
-
- if ('' === $appRoot) {
- // automatically find application root by dirname of Mage.php
- $appRoot = dirname(__FILE__);
- }
-
- $appRoot = realpath($appRoot);
-
- if (is_dir($appRoot) && is_readable($appRoot)) {
- self::$_appRoot = $appRoot;
- } else {
- self::throwException($appRoot . ' is not a directory or not readable by this user');
- }
- }
-
- /**
* Retrieve application root absolute path
*
* @return string
+ * @throws Magento_Exception
*/
public static function getRoot()
{
+ if (!self::$_appRoot) {
+ $appRootDir = __DIR__;
+ if (!is_readable($appRootDir)) {
+ throw new Magento_Exception("Application root directory '$appRootDir' is not readable.");
+ }
+ self::$_appRoot = $appRootDir;
+ }
return self::$_appRoot;
}
@@ -654,11 +628,8 @@ public static function throwException($message, $messageStorage = null)
public static function app($code = '', $type = 'store', $options = array())
{
if (null === self::$_app) {
- self::setRoot();
self::$_app = self::getObjectManager()->get('Mage_Core_Model_App');
self::$_events = new Varien_Event_Collection();
- self::_setIsInstalled($options);
- self::_setConfigModel($options);
Magento_Profiler::start('self::app::init');
self::$_app->init($code, $type, $options);
@@ -686,10 +657,7 @@ public static function setCurrentArea($areaCode)
public static function init($code = '', $type = 'store', $options = array(), $modules = array())
{
try {
- self::setRoot();
- self::$_app = self::getObjectManager()->create('Mage_Core_Model_App');
- self::_setIsInstalled($options);
- self::_setConfigModel($options);
+ self::$_app = self::getObjectManager()->create('Mage_Core_Model_App');
if (!empty($modules)) {
self::$_app->initSpecified($code, $type, $options, $modules);
@@ -719,7 +687,6 @@ public static function run($code = '', $type = 'store', $options = array())
{
try {
Magento_Profiler::start('mage');
- self::setRoot();
if (isset($options['edition'])) {
self::$_currentEdition = $options['edition'];
}
@@ -731,7 +698,6 @@ public static function run($code = '', $type = 'store', $options = array())
self::$_app->setResponse($options['response']);
}
self::$_events = new Varien_Event_Collection();
- self::_setIsInstalled($options);
self::$_app->run(array(
'scope_code' => $code,
'scope_type' => $type,
@@ -748,70 +714,19 @@ public static function run($code = '', $type = 'store', $options = array())
}
/**
- * Set application isInstalled flag based on given options
+ * Shortcut for the application "is installed" getter
*
- * @param array $options
- */
- protected static function _setIsInstalled($options = array())
- {
- if (isset($options['is_installed'])) {
- self::$_isInstalled = (bool) $options['is_installed'];
- }
- }
-
- /**
- * Set application Config model
- *
- * @param array $options
- */
- protected static function _setConfigModel($options = array())
- {
- if (isset($options['config_model']) && class_exists($options['config_model'])) {
- $alternativeConfigModelName = $options['config_model'];
- unset($options['config_model']);
- $alternativeConfigModel = new $alternativeConfigModelName($options);
- } else {
- $alternativeConfigModel = null;
- }
-
- if (!is_null($alternativeConfigModel) && ($alternativeConfigModel instanceof Mage_Core_Model_Config)) {
- self::$_config = $alternativeConfigModel;
- } else {
- self::$_config = self::getObjectManager()->get('Mage_Core_Model_Config');
- }
- }
-
- /**
- * Retrieve application installation flag
- *
- * @param string|array $options
* @return bool
+ * @throws Magento_Exception
+ *
+ * @todo Remove in favour of Mage_Core_Model_App::isInstalled() as soon as dependencies on application are injected
*/
- public static function isInstalled($options = array())
+ public static function isInstalled()
{
- if (self::$_isInstalled === null) {
- self::setRoot();
-
- if (is_string($options)) {
- $options = array('etc_dir' => $options);
- }
- $etcDir = self::getRoot() . DS . 'etc';
- if (!empty($options['etc_dir'])) {
- $etcDir = $options['etc_dir'];
- }
- $localConfigFile = $etcDir . DS . 'local.xml';
-
- self::$_isInstalled = false;
-
- if (is_readable($localConfigFile)) {
- $localConfig = simplexml_load_file($localConfigFile);
- date_default_timezone_set('UTC');
- if (($date = $localConfig->global->install->date) && strtotime($date)) {
- self::$_isInstalled = true;
- }
- }
+ if (!self::$_app) {
+ throw new Magento_Exception('Application instance has not been initialized yet.');
}
- return self::$_isInstalled;
+ return self::$_app->isInstalled();
}
/**
View
2 app/autoload.php
@@ -20,7 +20,7 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
require_once __DIR__ . '/../lib/Magento/Autoload/IncludePath.php';
View
110 app/bootstrap.php
@@ -18,45 +18,17 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @category Magento
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/* PHP version validation */
-if (version_compare(phpversion(), '5.3.0', '<') === true) {
- if (PHP_SAPI == 'cli') {
- echo 'Magento supports PHP 5.3.0 or newer. Please read http://www.magento.com/install.';
- } else {
- echo <<<HTML
-<div style="font:12px/1.35em arial, helvetica, sans-serif;">
- <div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
- <h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
- Whoops, it looks like you have an invalid PHP version.</h3>
- </div>
- <p>Magento supports PHP 5.3.0 or newer.
- <a href="http://www.magento.com/install" target="">Find out</a>
- how to install Magento using PHP-CGI as a work-around.
- </p>
-</div>
-HTML;
- }
- exit;
-}
-
-/**
- * Constants definition
+/**#@+
+ * Shortcut constants
*/
define('DS', DIRECTORY_SEPARATOR);
define('BP', dirname(__DIR__));
-
-if (file_exists(BP . '/maintenance.flag')) {
- if (PHP_SAPI == 'cli') {
- echo 'Service temporarily unavailable due to maintenance downtime.';
- } else {
- include_once BP . '/pub/errors/503.php';
- }
- exit;
-}
+/**#@-*/
/**
* Environment initialization
@@ -71,8 +43,55 @@
require_once BP . '/app/code/core/Mage/Core/functions.php';
require_once BP . '/app/Mage.php';
-if (isset($_SERVER['MAGE_IS_DEVELOPER_MODE'])) {
- Mage::setIsDeveloperMode(true);
+if (!defined('BARE_BOOTSTRAP')) {
+ /* PHP version validation */
+ if (version_compare(phpversion(), '5.3.0', '<') === true) {
+ if (PHP_SAPI == 'cli') {
+ echo 'Magento supports PHP 5.3.0 or newer. Please read http://www.magento.com/install.';
+ } else {
+ echo <<<HTML
+<div style="font:12px/1.35em arial, helvetica, sans-serif;">
+ <div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
+ <h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
+ Whoops, it looks like you have an invalid PHP version.</h3>
+ </div>
+ <p>Magento supports PHP 5.3.0 or newer.
+ <a href="http://www.magento.com/install" target="">Find out</a>
+ how to install Magento using PHP-CGI as a work-around.
+ </p>
+</div>
+HTML;
+ }
+ exit;
+ }
+ if (file_exists(BP . '/maintenance.flag')) {
+ if (PHP_SAPI == 'cli') {
+ echo 'Service temporarily unavailable due to maintenance downtime.';
+ } else {
+ include_once BP . '/pub/errors/503.php';
+ }
+ exit;
+ }
+ if (isset($_SERVER['MAGE_IS_DEVELOPER_MODE'])) {
+ Mage::setIsDeveloperMode(true);
+ }
+ if (!empty($_SERVER['MAGE_PROFILER'])) {
+ $profilerConfigData = $_SERVER['MAGE_PROFILER'];
+
+ $profilerConfig = array(
+ 'baseDir' => dirname(__DIR__),
+ 'tagFilters' => array()
+ );
+
+ if (is_scalar($profilerConfigData)) {
+ $profilerConfig['driver'] = array(
+ 'output' => is_numeric($profilerConfigData) ? 'html' : $profilerConfigData
+ );
+ } elseif (is_array($profilerConfigData)) {
+ $profilerConfig = array_merge($profilerConfig, $profilerConfigData);
+ }
+ Magento_Profiler::applyConfig($profilerConfig);
+ }
}
require_once __DIR__ . '/autoload.php';
@@ -92,24 +111,5 @@
$definitionsFile = BP . DS . 'var/di/definitions.php';
if (file_exists($definitionsFile)) {
- Mage::setRoot();
Mage::initializeObjectManager($definitionsFile);
}
-
-if (!empty($_SERVER['MAGE_PROFILER'])) {
- $profilerConfigData = $_SERVER['MAGE_PROFILER'];
-
- $profilerConfig = array(
- 'baseDir' => dirname(__DIR__),
- 'tagFilters' => array()
- );
-
- if (is_scalar($profilerConfigData)) {
- $profilerConfig['driver'] = array(
- 'output' => is_numeric($profilerConfigData) ? 'html' : $profilerConfigData
- );
- } elseif (is_array($profilerConfigData)) {
- $profilerConfig = array_merge($profilerConfig, $profilerConfigData);
- }
- Magento_Profiler::applyConfig($profilerConfig);
-}
View
2 app/code/community/Phoenix/Moneybookers/Block/Form.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Block_Form extends Mage_Payment_Block_Form
View
2 app/code/community/Phoenix/Moneybookers/Block/Info.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Block_Info extends Mage_Payment_Block_Info
View
2 app/code/community/Phoenix/Moneybookers/Block/Jsinit.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Block_Jsinit extends Mage_Adminhtml_Block_Template
View
2 app/code/community/Phoenix/Moneybookers/Block/Payment.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Block_Payment extends Mage_Core_Block_Template
View
2 app/code/community/Phoenix/Moneybookers/Block/Placeform.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Block_Placeform extends Mage_Core_Block_Template
View
2 app/code/community/Phoenix/Moneybookers/Block/Redirect.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Block_Redirect extends Mage_Core_Block_Template
View
2 app/code/community/Phoenix/Moneybookers/Helper/Data.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Helper_Data extends Mage_Payment_Helper_Data
View
2 app/code/community/Phoenix/Moneybookers/Model/Abstract.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
abstract class Phoenix_Moneybookers_Model_Abstract extends Mage_Payment_Model_Method_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/Acc.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Acc extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/Csi.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Csi extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/Did.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Did extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/Dnk.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Dnk extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/Ebt.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Ebt extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/Ent.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Ent extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/Event.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
View
2 app/code/community/Phoenix/Moneybookers/Model/Gcb.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Gcb extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/Gir.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Gir extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/Idl.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Idl extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/Lsr.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Lsr extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/Mae.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Mae extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/Npy.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Npy extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/Obt.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Obt extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/Pli.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Pli extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/Psp.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Psp extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/Pwy.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Pwy extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/Sft.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Sft extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/So2.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_So2 extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/Model/Wlt.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_Model_Wlt extends Phoenix_Moneybookers_Model_Abstract
View
2 app/code/community/Phoenix/Moneybookers/controllers/MoneybookersController.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_MoneybookersController extends Mage_Adminhtml_Controller_Action
View
2 app/code/community/Phoenix/Moneybookers/controllers/ProcessingController.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Phoenix_Moneybookers_ProcessingController extends Mage_Core_Controller_Front_Action
View
2 app/code/community/Phoenix/Moneybookers/etc/adminhtml/acl.xml
@@ -21,7 +21,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-->
View
2 app/code/community/Phoenix/Moneybookers/etc/adminhtml/system.xml
@@ -21,7 +21,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-->
View
2 app/code/community/Phoenix/Moneybookers/etc/config.xml
@@ -21,7 +21,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-->
View
2 app/code/community/Phoenix/Moneybookers/sql/moneybookers_setup/install-1.6.0.0.php
@@ -20,7 +20,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
View
2 app/code/community/Phoenix/Moneybookers/view/adminhtml/activation.js
@@ -19,7 +19,7 @@
*
* @category Phoenix
* @package Phoenix_Moneybookers
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
View
2 app/code/community/Phoenix/Moneybookers/view/adminhtml/info.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
?>
View
2 app/code/community/Phoenix/Moneybookers/view/adminhtml/jsinit.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
?>
View
2 app/code/community/Phoenix/Moneybookers/view/adminhtml/layout.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-->
View
2 app/code/community/Phoenix/Moneybookers/view/adminhtml/pdf/info.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package default_default
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
?>
View
2 app/code/community/Phoenix/Moneybookers/view/frontend/blank.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package base_default
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
?>
View
2 app/code/community/Phoenix/Moneybookers/view/frontend/form.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package base_default
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
?>
View
2 app/code/community/Phoenix/Moneybookers/view/frontend/info.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package base_default
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
?>
View
2 app/code/community/Phoenix/Moneybookers/view/frontend/layout.xml
@@ -21,7 +21,7 @@
*
* @category design
* @package base_default
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
View
2 app/code/community/Phoenix/Moneybookers/view/frontend/payment.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package base_default
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
?>
View
2 app/code/community/Phoenix/Moneybookers/view/frontend/placeform.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package base_default
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
?>
View
2 app/code/community/Phoenix/Moneybookers/view/frontend/redirect.phtml
@@ -20,7 +20,7 @@
*
* @category design
* @package base_default
- * @copyright Copyright (c) 2012 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
+ * @copyright Copyright (c) 2013 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
?>
View
2 app/code/core/Mage/AdminNotification/Helper/Data.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_AdminNotification
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
View
2 app/code/core/Mage/AdminNotification/Model/Config/Source/Frequency.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_AdminNotification
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
View
2 app/code/core/Mage/AdminNotification/Model/Feed.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_AdminNotification
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
View
2 app/code/core/Mage/AdminNotification/Model/Inbox.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_AdminNotification
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
View
2 app/code/core/Mage/AdminNotification/Model/Observer.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_AdminNotification
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
View
2 app/code/core/Mage/AdminNotification/Model/Resource/Inbox.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_AdminNotification
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
View
2 app/code/core/Mage/AdminNotification/Model/Resource/Inbox/Collection.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_AdminNotification
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
View
2 app/code/core/Mage/AdminNotification/Model/Survey.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_AdminNotification
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
View
2 app/code/core/Mage/AdminNotification/etc/adminhtml/acl.xml
@@ -21,7 +21,7 @@
*
* @category Mage
* @package Mage_AdminNotification
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
View
2 app/code/core/Mage/AdminNotification/etc/adminhtml/menu.xml
@@ -21,7 +21,7 @@
*
* @category Mage
* @package Mage_AdminNotification
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
View
2 app/code/core/Mage/AdminNotification/etc/adminhtml/system.xml
@@ -21,7 +21,7 @@
*
* @category Mage
* @package Mage_AdminNotification
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
View
2 app/code/core/Mage/AdminNotification/etc/config.xml
@@ -21,7 +21,7 @@
*
* @category Mage
* @package Mage_AdminNotification
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
View
2 app/code/core/Mage/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_AdminNotification
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
View
2 app/code/core/Mage/Adminhtml/Block/Abstract.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Adminhtml
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
View
2 app/code/core/Mage/Adminhtml/Block/Backup.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Adminhtml
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
View
2 app/code/core/Mage/Adminhtml/Block/Backup/Dialogs.php
@@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Adminhtml
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)