Skip to content

Watermark images could be in any extension - #20

Open
eab-andy wants to merge 4 commits into
ezsystems:masterfrom
eab-dev:WatermarkSubfolders
Open

Watermark images could be in any extension#20
eab-andy wants to merge 4 commits into
ezsystems:masterfrom
eab-dev:WatermarkSubfolders

Conversation

@eab-andy

Copy link
Copy Markdown

Mimic the ezimage() template operator and find a file that matches the given image name.

Without this PR, you can only store watermarks inside the ezie extension.

Mimic the ezimage() template operator and find a file that
matches the given image name.
Comment thread classes/image_tool_watermark.php Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cs

should be the following according to ez v1 coding standard used in legacy:

if ( !$fileInfo )
{

@andrerom

Copy link
Copy Markdown
Contributor

+1

@eab-andy

eab-andy commented Aug 5, 2015

Copy link
Copy Markdown
Author

Updated.

@andrerom

Copy link
Copy Markdown
Contributor

looks good, just one more cs comment open, I updated it to specify what I implied, up for it before we go ahead and create issue + squash and update commit messages + merge?

Follow coding standard for eZ Publish legacy
@eab-andy

eab-andy commented Sep 7, 2015

Copy link
Copy Markdown
Author

Thanks for clarifying that. I've edited again.

@andrerom

andrerom commented Sep 9, 2015

Copy link
Copy Markdown
Contributor

Ok, looks ok. remain part is create an issue, rebase the branch to squash commits into one referring to the issue and force push and you should be done :)

something like

git rebase -i master
# a interactive screen will allow you to put a 's' in front of each line but the first one
git push eab-dev WatermarkSubfolders -f

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants