Skip to content
Permalink
Browse files

init 1.9.2.2

  • Loading branch information...
daniel-rose committed Oct 28, 2015
1 parent 2802bec commit 5dc8942a330a462e0992494d4cd70d028f27c851
Showing with 8,826 additions and 3,002 deletions.
  1. +25 −0 .htaccess
  2. +24 −0 .htaccess.sample
  3. +117 −107 RELEASE_NOTES.txt
  4. +1 −1 app/Mage.php
  5. +84 −0 app/code/core/Mage/Admin/Model/Block.php
  6. +44 −0 app/code/core/Mage/Admin/Model/Resource/Block.php
  7. +44 −0 app/code/core/Mage/Admin/Model/Resource/Block/Collection.php
  8. +43 −0 app/code/core/Mage/Admin/Model/Resource/Variable.php
  9. +44 −0 app/code/core/Mage/Admin/Model/Resource/Variable/Collection.php
  10. +80 −0 app/code/core/Mage/Admin/Model/Variable.php
  11. +7 −1 app/code/core/Mage/Admin/etc/config.xml
  12. +103 −0 app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.1-1.6.1.2.php
  13. +57 −0 app/code/core/Mage/Adminhtml/Block/Permissions/Block.php
  14. +64 −0 app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit.php
  15. +84 −0 app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit/Form.php
  16. +103 −0 app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php
  17. +57 −0 app/code/core/Mage/Adminhtml/Block/Permissions/Variable.php
  18. +62 −0 app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit.php
  19. +88 −0 app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit/Form.php
  20. +104 −0 app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Grid.php
  21. +216 −0 app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php
  22. +215 −0 app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php
  23. +14 −0 app/code/core/Mage/Adminhtml/etc/adminhtml.xml
  24. +13 −17 app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
  25. +23 −1 app/code/core/Mage/Connect/Helper/Data.php
  26. +11 −1 app/code/core/Mage/Core/Controller/Front/Action.php
  27. +23 −0 app/code/core/Mage/Core/Controller/Varien/Router/Admin.php
  28. +46 −0 app/code/core/Mage/Core/Helper/UnserializeArray.php
  29. +5 −0 app/code/core/Mage/Core/Model/Email/Queue.php
  30. +13 −3 app/code/core/Mage/Core/Model/Email/Template/Filter.php
  31. +0 −1 app/code/core/Mage/Core/Model/Resource/Setup.php
  32. +1 −0 app/code/core/Mage/Core/etc/config.xml
  33. +12 −2 app/code/core/Mage/Core/etc/system.xml
  34. +37 −0 app/code/core/Mage/Customer/Block/Account/Changeforgotten.php
  35. +3 −0 app/code/core/Mage/Customer/Block/Account/Resetpassword.php
  36. +95 −32 app/code/core/Mage/Customer/controllers/AccountController.php
  37. +8 −1 app/code/core/Mage/Downloadable/Model/Product/Type.php
  38. +5 −2 app/code/core/Mage/Eav/Model/Resource/Attribute/Collection.php
  39. +13 −0 app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php
  40. +16 −1 app/code/core/Mage/Sales/controllers/DownloadController.php
  41. +4 −4 app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php
  42. +12 −1 app/design/adminhtml/default/default/layout/admin.xml
  43. +3 −3 app/design/frontend/base/default/layout/customer.xml
  44. +1 −0 app/design/frontend/base/default/template/customer/form/register.phtml
  45. +1 −1 app/design/frontend/base/default/template/customer/form/resetforgottenpassword.phtml
  46. +1 −0 app/design/frontend/base/default/template/persistent/customer/form/register.phtml
  47. +3 −3 app/design/frontend/default/iphone/layout/customer.xml
  48. +3 −3 app/design/frontend/default/modern/layout/customer.xml
  49. +3 −3 app/design/frontend/rwd/default/layout/customer.xml
  50. +1 −1 app/design/frontend/rwd/default/template/customer/form/resetforgottenpassword.phtml
  51. +1 −0 app/design/frontend/rwd/default/template/persistent/customer/form/register.phtml
  52. +32 −0 app/locale/en_US/Mage_Adminhtml.csv
  53. +3 −0 app/locale/en_US/Mage_Core.csv
  54. +5 −4 cron.php
  55. 0 cron.sh
  56. +2 −2 dev/.htaccess
  57. +1 −2 dev/tests/functional/composer.json
  58. +0 −13 dev/tests/functional/lib/Magento/Mtf/Util/Generate/Page.php
  59. +0 −7 dev/tests/functional/tests/app/Mage/Admin/Test/Fixture/Role/RolesResources.php
  60. +0 −30 dev/tests/functional/tests/app/Mage/Admin/Test/TestCase/UseAclRoleWithRestrictedGwsScopeTest.php
  61. +0 −1 dev/tests/functional/tests/app/Mage/Admin/Test/TestCase/UseAclRoleWithRestrictedGwsScopeTest.xml
  62. +1 −1 dev/tests/functional/tests/app/Mage/Adminhtml/Test/Page/Adminhtml/Dashboard.xml
  63. +19 −11 dev/tests/functional/tests/app/Mage/Adminhtml/Test/Repository/ConfigData.xml
  64. +6 −8 dev/tests/functional/tests/app/Mage/Adminhtml/Test/TestCase/CreateStoreEntityTest.xml
  65. +310 −310 dev/tests/functional/tests/app/Mage/Authorizenet/Test/Repository/ConfigData.xml
  66. +2 −2 ...s/app/Mage/Authorizenet/Test/TestCase/CreateOfflineInvoiceForAuthorizenetDirectpostMethodTest.xml
  67. +1 −0 ...Mage/Authorizenet/Test/TestCase/CreateOfflineInvoiceForOnlinePaymentsMethodsWithoutIFrameTest.xml
  68. +2 −1 ...ts/app/Mage/Authorizenet/Test/TestCase/CreateOfflineRefundForAuthorizenetDirectpostMethodTest.php
  69. +3 −97 ...ts/app/Mage/Authorizenet/Test/TestCase/CreateOfflineRefundForAuthorizenetDirectpostMethodTest.xml
  70. +1 −1 ...ts/app/Mage/Authorizenet/Test/TestCase/CreateOnlineInvoiceForAuthorizenetDirectpostMethodTest.xml
  71. +1 −0 .../Mage/Authorizenet/Test/TestCase/CreateOnlineInvoiceForOnlinePaymentsMethodsWithoutIFrameTest.xml
  72. +64 −64 ...nal/tests/app/Mage/Authorizenet/Test/TestCase/CreateOrderWithAuthorizenetDirectpostMethodTest.xml
  73. +2 −0 ...ests/app/Mage/Authorizenet/Test/TestCase/CreateOrderWithOnlinePaymentsMethodsWith3DSecureTest.xml
  74. +61 −58 ...sts/app/Mage/Authorizenet/Test/TestCase/CreateOrderWithOnlinePaymentsMethodsWithoutIFrameTest.xml
  75. +2 −2 ...l/tests/app/Mage/Authorizenet/Test/TestCase/CreateShipmentForAuthorizenetDirectpostMethodTest.xml
  76. +1 −1 dev/tests/functional/tests/app/Mage/Authorizenet/Test/etc/testcase.xml
  77. +1 −1 dev/tests/functional/tests/app/Mage/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.xml
  78. +26 −5 ...sts/functional/tests/app/Mage/Checkout/Test/Constraint/AssertAbstractOrderAddressSameAsPaypal.php
  79. +0 −1 dev/tests/functional/tests/app/Mage/Checkout/Test/Fixture/Cart/Items.php
  80. +2 −2 dev/tests/functional/tests/app/Mage/Checkout/Test/Page/CheckoutOnepageSuccess.xml
  81. +1 −0 dev/tests/functional/tests/app/Mage/Checkout/Test/TestStep/AddProductsToTheCartStep.php
  82. +104 −0 dev/tests/functional/tests/app/Mage/Install/Test/Block/ContinueDownloadBlock.php
  83. +1 −1 dev/tests/functional/tests/app/Mage/Install/Test/Block/License.php
  84. +17 −0 dev/tests/functional/tests/app/Mage/Install/Test/Block/Main.php
  85. +70 −0 dev/tests/functional/tests/app/Mage/Install/Test/Block/Welcome.php
  86. +1 −1 dev/tests/functional/tests/app/Mage/Install/Test/Constraint/AssertAgreementTextPresent.php
  87. +67 −0 dev/tests/functional/tests/app/Mage/Install/Test/Constraint/AssertDownloadCompleted.php
  88. +67 −0 dev/tests/functional/tests/app/Mage/Install/Test/Constraint/AssertSuccessDeploy.php
  89. +66 −0 dev/tests/functional/tests/app/Mage/Install/Test/Constraint/AssertWelcomeWizardTextPresent.php
  90. +33 −0 dev/tests/functional/tests/app/Mage/Install/Test/Page/Downloader.xml
  91. +32 −0 dev/tests/functional/tests/app/Mage/Install/Test/Page/DownloaderDeploy.xml
  92. +33 −0 dev/tests/functional/tests/app/Mage/Install/Test/Page/DownloaderDeployEnd.xml
  93. +32 −0 dev/tests/functional/tests/app/Mage/Install/Test/Page/DownloaderValidation.xml
  94. +33 −0 dev/tests/functional/tests/app/Mage/Install/Test/Page/DownloaderWelcome.xml
  95. +193 −0 dev/tests/functional/tests/app/Mage/Install/Test/TestCase/DownloaderTest.php
  96. +38 −0 dev/tests/functional/tests/app/Mage/Install/Test/TestCase/DownloaderTest.xml
  97. +5 −40 dev/tests/functional/tests/app/Mage/Install/Test/TestCase/InstallTest.php
  98. +5 −0 dev/tests/functional/tests/app/Mage/Install/Test/TestCase/InstallTest.xml
  99. +1 −1 dev/tests/functional/tests/app/Mage/Payment/Test/Repository/Cc.xml
  100. +55 −2 dev/tests/functional/tests/app/Mage/Paypal/Test/Block/Login.php
  101. +4 −2 dev/tests/functional/tests/app/Mage/Paypal/Test/Block/Login.xml
  102. +1 −1 dev/tests/functional/tests/app/Mage/Paypal/Test/Block/OldReview.php
  103. +1 −1 dev/tests/functional/tests/app/Mage/Paypal/Test/Page/Paypal.php
  104. +1 −1 dev/tests/functional/tests/app/Mage/Paypal/Test/Page/PaypalExpressReview.xml
  105. +1,512 −1,494 dev/tests/functional/tests/app/Mage/Paypal/Test/Repository/ConfigData.xml
  106. +1 −0 dev/tests/functional/tests/app/Mage/Paypal/Test/Repository/PaypalAddress.xml
  107. +14 −0 ...ests/functional/tests/app/Mage/Paypal/Test/TestCase/CreateInvoiceForPaypalExpressCheckoutTest.xml
  108. +18 −12 ...ests/app/Mage/Paypal/Test/TestCase/CreateOfflineInvoiceForOnlinePaymentsMethodsWithIFrameTest.xml
  109. +4 −0 ...s/app/Mage/Paypal/Test/TestCase/CreateOfflineInvoiceForOnlinePaymentsMethodsWithoutIFrameTest.xml
  110. +6 −3 ...tests/app/Mage/Paypal/Test/TestCase/CreateOnlineInvoiceForOnlinePaymentsMethodsWithIFrameTest.xml
  111. +4 −0 ...ts/app/Mage/Paypal/Test/TestCase/CreateOnlineInvoiceForOnlinePaymentsMethodsWithoutIFrameTest.xml
  112. +27 −19 .../tests/app/Mage/Paypal/Test/TestCase/CreateOnlineRefundForOnlinePaymentsMethodsWithIFrameTest.xml
  113. +10 −0 ...sts/app/Mage/Paypal/Test/TestCase/CreateOnlineRefundForOnlinePaymentsMethodsWithoutIFrameTest.xml
  114. +9 −0 ...functional/tests/app/Mage/Paypal/Test/TestCase/CreateOnlineRefundForPaypalExpressCheckoutTest.xml
  115. +8 −0 ...onal/tests/app/Mage/Paypal/Test/TestCase/CreateOrderWithOnlinePaymentsMethodsWith3DSecureTest.xml
  116. +132 −126 ...tional/tests/app/Mage/Paypal/Test/TestCase/CreateOrderWithOnlinePaymentsMethodsWithIFrameTest.xml
  117. +125 −113 ...nal/tests/app/Mage/Paypal/Test/TestCase/CreateOrderWithOnlinePaymentsMethodsWithoutIFrameTest.xml
  118. +49 −43 dev/tests/functional/tests/app/Mage/Paypal/Test/TestCase/CreateOrderWithPayPalStandardTest.xml
  119. +5 −3 ...ional/tests/app/Mage/Paypal/Test/TestCase/CreateShipmentForOnlinePaymentMethodsWithIFrameTest.xml
  120. +8 −0 ...al/tests/app/Mage/Paypal/Test/TestCase/CreateShipmentForOnlinePaymentMethodsWithoutIFrameTest.xml
  121. +9 −0 ...sts/functional/tests/app/Mage/Paypal/Test/TestCase/CreateShipmentForPaypalExpressCheckoutTest.xml
  122. +142 −135 ...Mage/Paypal/Test/TestCase/TestCreationForExpressCheckoutWithinPayPalButtonFromProductPageTest.xml
  123. +8 −0 ...onal/tests/app/Mage/Paypal/Test/TestCase/TestCreationForExpressCheckoutWithinPayPalButtonTest.xml
  124. +1 −0 dev/tests/functional/tests/app/Mage/Paypal/Test/TestStep/FillCreditCardInIFrameStep.php
  125. +1 −0 dev/tests/functional/tests/app/Mage/Paypal/Test/TestStep/LoginToPayPalStep.php
  126. +0 −3 dev/tests/functional/tests/app/Mage/SalesRule/Test/Handler/SalesRule/Curl.php
  127. +0 −21 dev/tests/functional/tests/app/Mage/Widget/Test/Fixture/Widget.xml
  128. +0 −1 dev/tests/functional/tests/app/Mage/Widget/Test/Page/Adminhtml/WidgetInstanceEdit.xml
  129. +34 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/authorizenet.xml
  130. +34 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/authorizenetdp.xml
  131. +34 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/installationce.xml
  132. +34 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/paypal.xml
  133. +34 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/paypal1.xml
  134. +34 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/paypaladvanced.xml
  135. +34 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/paypaldirect.xml
  136. +34 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/paypalecbutton.xml
  137. +34 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/paypalecbuttonproduct.xml
  138. +34 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/paypalecinvoice.xml
  139. +34 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/paypalecrefund.xml
  140. +34 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/paypalecshipment.xml
  141. +34 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/paypalhostedsolution.xml
  142. +34 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/paypalpayflowlink.xml
  143. +34 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/paypalpayflowpro.xml
  144. +34 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/paypalpaymentspro.xml
  145. +34 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/paypalstandard.xml
  146. +49 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/suite1.xml
  147. +89 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/suite2.xml
  148. +46 −0 dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/suite3.xml
  149. +1 −1 downloader/Maged/Controller.php
  150. +15 −0 downloader/lib/Mage/Archive/Helper/File/Gz.php
  151. +21 −3 errors/design.xml
  152. +1 −0 errors/processor.php
  153. +15 −0 lib/Mage/Archive/Helper/File/Gz.php
  154. +61 −0 lib/Unserialize/Parser.php
  155. +122 −0 lib/Unserialize/Reader/Arr.php
  156. +84 −0 lib/Unserialize/Reader/ArrKey.php
  157. +100 −0 lib/Unserialize/Reader/ArrValue.php
  158. +66 −0 lib/Unserialize/Reader/Bool.php
  159. +66 −0 lib/Unserialize/Reader/Dbl.php
  160. +66 −0 lib/Unserialize/Reader/Int.php
  161. +93 −0 lib/Unserialize/Reader/Str.php
  162. +1 −1 lib/Varien/Cache/Backend/Database.php
  163. +9 −3 lib/Varien/Data/Collection/Db.php
  164. +3 −3 lib/Zend/Amf/Server.php
  165. +4 −2 lib/Zend/Application.php
  166. +1 −1 lib/Zend/Cloud/StorageService/Adapter/FileSystem.php
  167. +3 −3 lib/Zend/Console/Getopt.php
  168. +2 −2 lib/Zend/Controller/Action/Helper/Redirector.php
  169. +15 −7 lib/Zend/Controller/Action/Helper/ViewRenderer.php
  170. +14 −0 lib/Zend/Controller/Request/Http.php
  171. +1 −0 lib/Zend/Controller/Request/HttpTestCase.php
  172. +5 −4 lib/Zend/Controller/Router/Route/Chain.php
  173. +1 −1 lib/Zend/Date/DateObject.php
  174. +2 −1 lib/Zend/Db/Adapter/Pdo/Abstract.php
  175. +1 −1 lib/Zend/Db/Adapter/Pdo/Mssql.php
  176. +5 −3 lib/Zend/Db/Select.php
  177. +29 −6 lib/Zend/Dom/Query.php
  178. +1 −1 lib/Zend/Form.php
  179. +61 −25 lib/Zend/Http/Client.php
  180. +16 −9 lib/Zend/Http/Client/Adapter/Curl.php
  181. +1 −1 lib/Zend/Http/Client/Adapter/Proxy.php
  182. +127 −0 lib/Zend/Http/Header/HeaderValue.php
  183. +8 −0 lib/Zend/Http/Header/SetCookie.php
  184. +55 −19 lib/Zend/Http/Response.php
  185. +3 −1 lib/Zend/Http/UserAgent/AbstractDevice.php
  186. +1 −1 lib/Zend/Loader/Autoloader.php
  187. +15 −0 lib/Zend/Locale/Data.php
  188. +1 −1 lib/Zend/Locale/Math.php
  189. +20 −5 lib/Zend/Log.php
  190. +92 −0 lib/Zend/Mail/Header/HeaderName.php
  191. +136 −0 lib/Zend/Mail/Header/HeaderValue.php
  192. +1 −0 lib/Zend/Mail/Message.php
  193. +37 −3 lib/Zend/Mail/Part.php
  194. +1 −0 lib/Zend/Mail/Storage.php
  195. +2 −0 lib/Zend/Mail/Storage/Imap.php
  196. +6 −0 lib/Zend/Measure/Number.php
  197. +1 −1 lib/Zend/Registry.php
  198. +3 −2 lib/Zend/Search/Lucene/Storage/Directory/Filesystem.php
  199. +0 −16 lib/Zend/Serializer/Adapter/PythonPickle.php
  200. +7 −5 lib/Zend/Service/WindowsAzure/CommandLine/PackageScaffolder/PackageScaffolderAbstract.php
  201. +3 −3 lib/Zend/Session.php
  202. +43 −0 lib/Zend/Session/Validator/Exception.php
  203. +6 −2 lib/Zend/Translate.php
  204. +3 −1 lib/Zend/Translate/Adapter.php
  205. +1 −1 lib/Zend/Translate/Plural.php
  206. +1 −1 lib/Zend/Validate/EmailAddress.php
  207. +2 −2 lib/Zend/Validate/Hostname.php
  208. +1 −1 lib/Zend/Version.php
  209. +53 −4 lib/Zend/View.php
  210. +12 −1 lib/Zend/View/Helper/HeadLink.php
  211. +16 −0 lib/Zend/View/Helper/HeadMeta.php
  212. +13 −1 lib/Zend/View/Helper/HeadScript.php
  213. +8 −1 lib/Zend/View/Helper/HeadStyle.php
  214. +4 −0 lib/Zend/View/Helper/Navigation.php
  215. +1 −1 lib/Zend/View/Helper/Navigation/HelperAbstract.php
  216. +340 −11 lib/Zend/Xml/Security.php
  217. +4 −4 lib/Zend/XmlRpc/Server.php
  218. 0 mage
  219. +18 −0 var/package/Cm_RedisSession-1.9.2.2.xml
  220. +18 −0 var/package/Interface_Adminhtml_Default-1.9.2.2.xml
  221. +18 −0 var/package/Interface_Frontend_Base_Default-1.9.2.2.xml
  222. +18 −0 var/package/Interface_Frontend_Default-1.9.2.2.xml
  223. +18 −0 var/package/Interface_Frontend_Rwd_Default-1.9.2.2.xml
  224. +18 −0 var/package/Interface_Install_Default-1.9.2.2.xml
  225. +18 −0 var/package/Lib_Cm-1.9.2.2.xml
  226. +18 −0 var/package/Lib_Credis-1.9.2.2.xml
  227. +18 −0 var/package/Lib_Google_Checkout-1.9.2.2.xml
  228. +18 −0 var/package/Lib_IDNA2-1.9.2.2.xml
  229. +18 −0 var/package/Lib_Js_Calendar-1.51.1.3.xml
  230. +18 −0 var/package/Lib_Js_Ext-1.9.2.2.xml
  231. +18 −0 var/package/Lib_Js_Mage-1.9.2.2.xml
  232. +18 −0 var/package/Lib_Js_Prototype-1.9.2.2.xml
  233. +18 −0 var/package/Lib_Js_TinyMCE-3.5.11.2.xml
  234. +18 −0 var/package/Lib_LinLibertineFont-2.8.14.3.xml
  235. +18 −0 var/package/Lib_Mage-1.9.2.2.xml
  236. +18 −0 var/package/Lib_Magento-1.9.2.2.xml
  237. +18 −0 var/package/Lib_Pelago-1.9.2.2.xml
  238. +18 −0 var/package/Lib_Phpseclib-1.9.2.2.xml
  239. +18 −0 var/package/Lib_Unserialize-1.9.2.2.xml
  240. +18 −0 var/package/Lib_Varien-1.9.2.2.xml
  241. +18 −0 var/package/Lib_ZF-1.12.10.2.xml
  242. +19 −0 var/package/Lib_ZF_Locale-1.12.10.2.xml
  243. +18 −0 var/package/Mage_All_Latest-1.9.2.2.xml
  244. +18 −0 var/package/Mage_Centinel-1.9.2.2.xml
  245. +18 −0 var/package/Mage_Compiler-1.9.2.2.xml
  246. +18 −0 var/package/Mage_Core_Adminhtml-1.9.2.2.xml
  247. +18 −0 var/package/Mage_Core_Modules-1.9.2.2.xml
  248. +18 −0 var/package/Mage_Downloader-1.9.2.2.xml
  249. +18 −0 var/package/Mage_Locale_en_US-1.9.2.2.xml
  250. +18 −0 var/package/Magento_Mobile-1.9.2.2.xml
  251. +35 −0 var/package/Phoenix_Moneybookers-1.9.2.2.xml
@@ -207,3 +207,28 @@
## http://developer.yahoo.com/performance/rules.html#etags

#FileETag none

###########################################
## Deny access to cron.php
<Files cron.php>

############################################
## uncomment next lines to enable cron access with base HTTP authorization
## http://httpd.apache.org/docs/2.2/howto/auth.html
##
## Warning: .htpasswd file should be placed somewhere not accessible from the web.
## This is so that folks cannot download the password file.
## For example, if your documents are served out of /usr/local/apache/htdocs
## you might want to put the password file(s) in /usr/local/apache/.

#AuthName "Cron auth"
#AuthUserFile ../.htpasswd
#AuthType basic
#Require valid-user

############################################

Order allow,deny
Deny from all

</Files>
@@ -176,3 +176,27 @@

#FileETag none

###########################################
## Deny access to cron.php
<Files cron.php>

############################################
## uncomment next lines to enable cron access with base HTTP authorization
## http://httpd.apache.org/docs/2.2/howto/auth.html
##
## Warning: .htpasswd file should be placed somewhere not accessible from the web.
## This is so that folks cannot download the password file.
## For example, if your documents are served out of /usr/local/apache/htdocs
## you might want to put the password file(s) in /usr/local/apache/.

#AuthName "Cron auth"
#AuthUserFile ../.htpasswd
#AuthType basic
#Require valid-user

############################################

Order allow,deny
Deny from all

</Files>

Large diffs are not rendered by default.

@@ -171,7 +171,7 @@ public static function getVersionInfo()
'major' => '1',
'minor' => '9',
'revision' => '2',
'patch' => '1',
'patch' => '2',
'stability' => '',
'number' => '',
);
@@ -0,0 +1,84 @@
<?php
/**
* Magento
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magento.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
* Class Mage_Admin_Model_Block
*
* @category Mage
* @package Mage_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Block extends Mage_Core_Model_Abstract
{
/**
* Initialize variable model
*/
protected function _construct()
{
$this->_init('admin/block');
}
/**
* @return array|bool
* @throws Exception
* @throws Zend_Validate_Exception
*/
public function validate()
{
$errors = array();
if (!Zend_Validate::is($this->getBlockName(), 'NotEmpty')) {
$errors[] = Mage::helper('adminhtml')->__('Block Name is required field.');
}
if (!Zend_Validate::is($this->getBlockName(), 'Regex', array('/^[-_a-zA-Z0-9\/]*$/'))) {
$errors[] = Mage::helper('adminhtml')->__('Block Name is incorrect.');
}
if (!in_array($this->getIsAllowed(), array('0', '1'))) {
$errors[] = Mage::helper('adminhtml')->__('Is Allowed is required field.');
}
if (empty($errors)) {
return true;
}
return $errors;
}
/**
* Check is block with such type allowed for parsinf via blockDirective method
*
* @param $type
* @return int
*/
public function isTypeAllowed($type)
{
/** @var Mage_Admin_Model_Resource_Block_Collection $collection */
$collection = Mage::getResourceModel('admin/block_collection');
$collection->addFieldToFilter('block_name', array('eq' => $type))
->addFieldToFilter('is_allowed', array('eq' => 1));
return $collection->load()->count();
}
}
@@ -0,0 +1,44 @@
<?php
/**
* Magento
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magento.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
* Class Mage_Admin_Model_Resource_Block
*
* @category Mage
* @package Mage_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Resource_Block extends Mage_Core_Model_Resource_Db_Abstract
{
/**
* Define main table
*
*/
protected function _construct()
{
$this->_init('admin/permission_block', 'block_id');
}
}
@@ -0,0 +1,44 @@
<?php
/**
* Magento
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magento.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
* Admin permissions block collection
*
* @category Mage
* @package Mage_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Resource_Block_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
/**
* Define resource model
*
*/
protected function _construct()
{
$this->_init('admin/block');
}
}
@@ -0,0 +1,43 @@
<?php
/**
* Magento
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magento.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
* Resource model for manipulate system variables
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Resource_Variable extends Mage_Core_Model_Resource_Db_Abstract
{
/**
* Define main table
*/
protected function _construct()
{
$this->_init('admin/permission_variable', 'variable_id');
}
}
@@ -0,0 +1,44 @@
<?php
/**
* Magento
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@magento.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magento.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
* Admin permissions variable collection
*
* @category Mage
* @package Mage_Admin
* @author Magento Core Team <core@magentocommerce.com>
*/
class Mage_Admin_Model_Resource_Variable_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
{
/**
* Define resource model
*
*/
protected function _construct()
{
$this->_init('admin/variable');
}
}

0 comments on commit 5dc8942

Please sign in to comment.
You can’t perform that action at this time.