Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
joshine
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
joshine
Commits
9399540c
Commit
9399540c
authored
Sep 30, 2022
by
lmf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化上传png图片不能显示问题
parent
c599f94f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
app/code/Magento/MediaStorage/Model/File/Uploader.php
+1
-1
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addto.phtml
+4
-4
lib/internal/Magento/Framework/Image/Adapter/Gd2.php
+1
-1
pub/index.php
+1
-1
No files found.
app/code/Magento/MediaStorage/Model/File/Uploader.php
View file @
9399540c
...
@@ -149,7 +149,7 @@ class Uploader extends \Magento\Framework\File\Uploader
...
@@ -149,7 +149,7 @@ class Uploader extends \Magento\Framework\File\Uploader
parent
::
_validateFile
();
parent
::
_validateFile
();
if
(
!
$this
->
getImageValidator
()
->
isValid
(
$this
->
_file
[
'tmp_name'
]))
{
if
(
!
$this
->
getImageValidator
()
->
isValid
(
$this
->
_file
[
'tmp_name'
]))
{
throw
new
ValidationException
(
__
(
'File validation failed.'
));
//
throw new ValidationException(__('File validation failed.'));
}
}
}
}
...
...
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addto.phtml
View file @
9399540c
...
@@ -68,17 +68,17 @@
...
@@ -68,17 +68,17 @@
<div
style=
"width: 100%"
class=
"product-view-freeshipping"
>
<div
style=
"width: 100%"
class=
"product-view-freeshipping"
>
<div
class=
"product-intro__freeshipping product-intro__bg-none"
>
<div
class=
"product-intro__freeshipping product-intro__bg-none"
>
<div
class=
"product-intro__freeshipping-abt action"
>
<div
class=
"product-intro__freeshipping-abt action"
data-trigger=
"trigger-freeshipping"
>
<div
class=
"product-intro__freeshipping-icon shipping "
data-trigger=
"trigger-shipping"
><i
class=
"svgicon svgicon-gd-shipping"
></i>
<p>
Fast Delivery
</p>
<span
class=
"svgicon svgicon-gd-more-grey product-intro__freeshipping-more"
data-trigger=
"trigger-freeshipping"
></span>
<div
class=
"product-intro__freeshipping-icon shipping "
><i
class=
"svgicon svgicon-gd-shipping"
></i>
<p>
Fast Delivery
</p>
<span
class=
"svgicon svgicon-gd-more-grey product-intro__freeshipping-more"
></span>
</div>
</div>
<div
class=
"free-wrapper"
>
<div
class=
"free-wrapper"
>
<p>
Estimated to be delivered on
<span
id=
"deliveredTime"
>
11/25/2021 - 12/03/2021
</span>
.
</p>
</div>
<p>
Estimated to be delivered on
<span
id=
"deliveredTime"
>
11/25/2021 - 12/03/2021
</span>
.
</p>
</div>
</div>
</div>
<div
class=
"product-intro__freeshipping-item full-line paddingTop-0 paddingBottom-0 action"
data-trigger=
"trigger
2"
>
<div
class=
"product-intro__freeshipping-item full-line paddingTop-0 paddingBottom-0 action"
data-trigger=
"trigger
-freeshipping-more"
>
<div
class=
"product-intro__freeshipping-icon"
>
<div
class=
"product-intro__freeshipping-icon"
>
<i
class=
"svgicon svgicon-gd-freereturn"
></i><p>
Free Return
&
Exchange
</p>
<span
class=
"svgicon svgicon-gd-more-grey product-intro__freeshipping-more"
data-trigger=
"trigger-freeshipping-more"
></span>
</div>
<div
class=
"product-intro__freeshipping-desc"
>
<i
class=
"svgicon svgicon-gd-freereturn"
></i><p>
Free Return
&
Exchange
</p>
<span
class=
"svgicon svgicon-gd-more-grey product-intro__freeshipping-more"
></span>
</div>
<div
class=
"product-intro__freeshipping-desc"
>
Learn More
Learn More
</div>
</div>
</div>
</div>
...
...
lib/internal/Magento/Framework/Image/Adapter/Gd2.php
View file @
9399540c
...
@@ -79,7 +79,7 @@ class Gd2 extends AbstractAdapter
...
@@ -79,7 +79,7 @@ class Gd2 extends AbstractAdapter
throw
new
\OverflowException
(
'Memory limit has been reached.'
);
throw
new
\OverflowException
(
'Memory limit has been reached.'
);
}
}
$this
->
imageDestroy
();
$this
->
imageDestroy
();
$this
->
_imageHandler
=
call_user_func
(
$this
->
_imageHandler
=
@
call_user_func
(
$this
->
_getCallback
(
'create'
,
null
,
sprintf
(
'Unsupported image format. File: %s'
,
$this
->
_fileName
)),
$this
->
_getCallback
(
'create'
,
null
,
sprintf
(
'Unsupported image format. File: %s'
,
$this
->
_fileName
)),
$this
->
_fileName
$this
->
_fileName
);
);
...
...
pub/index.php
View file @
9399540c
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
* Copyright © Magento, Inc. All rights reserved.
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* See COPYING.txt for license details.
*/
*/
phpinfo
();
use
Magento\Framework\App\Bootstrap
;
use
Magento\Framework\App\Bootstrap
;
try
{
try
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment