Merge commit 'refs/pull/1048/head' of https://github.com/magento/magento2 into MAGETWO-34527

Eugene Tulika · Eugene Tulika · commit 103bd30475d2 · 2015-03-18T16:36:36.000-05:00
Conflicts:
	app/code/Magento/Theme/etc/adminhtml/system.xml
diff --git a/app/code/Magento/Config/Model/Config/Backend/Image/Logo.php b/app/code/Magento/Config/Model/Config/Backend/Image/Logo.php
@@ -37,4 +37,14 @@ protected function _addWhetherScopeInfo()
     {
         return true;
     }
+
+    /**
+     * Getter for allowed extensions of uploaded files.
+     *
+     * @return string[]
+     */
+    protected function _getAllowedExtensions()
+    {
+        return ['jpg', 'jpeg', 'gif', 'png', 'svg'];
+    }
 }
diff --git a/app/code/Magento/Theme/etc/adminhtml/system.xml b/app/code/Magento/Theme/etc/adminhtml/system.xml
@@ -61,7 +61,7 @@
                 <label>Header</label>
                 <field id="logo_src" translate="label" type="image" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Logo Image</label>
-                    <comment>Allowed file types:PNG, GIF, JPG, JPEG.</comment>
+                    <comment>Allowed file types:PNG, GIF, JPG, JPEG, SVG.</comment>
                     <backend_model>Magento\Config\Model\Config\Backend\Image\Logo</backend_model>
                     <base_url type="media" scope_info="1">logo</base_url>
                 </field>

Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,14 @@ protected function _addWhetherScopeInfo()`
`37`	`37`	`{`
`38`	`38`	`return true;`
`39`	`39`	`}`
	`40`	`+`
	`41`	`+ /**`
	`42`	`+ * Getter for allowed extensions of uploaded files.`
	`43`	`+ *`
	`44`	`+ * @return string[]`
	`45`	`+ */`
	`46`	`+ protected function _getAllowedExtensions()`
	`47`	`+ {`
	`48`	`+ return ['jpg', 'jpeg', 'gif', 'png', 'svg'];`
	`49`	`+ }`
`40`	`50`	`}`