Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fixed the Stylesheet.class.php $target_path & target_uri to contain only the file, not the full path & uri to file. #61

Merged
merged 2 commits into from
Aug 19, 2014

Conversation

villeristi
Copy link

No description provided.

@fabrizim
Copy link
Collaborator

Looks good to me - I've seen this issue particularly with "Any Hostname" or the multisite "Domain Mapping" plugins. I think this will help resolve it - I will merge now. Thanks!

fabrizim added a commit that referenced this pull request Aug 19, 2014
Fixed the Stylesheet.class.php $target_path & target_uri to contain only the file, not the full path & uri to file.
@fabrizim fabrizim merged commit fd2251d into thom4parisot:master Aug 19, 2014
@thom4parisot
Copy link
Owner

You could enforce safely the presence of a slash in self::upload_dir by using the trailingslashit function.

Just for the sake of avoiding a possible double slash issue (if self::upload_dir ends with a slash).

👍 otherwise, and thanks @fabrizim for dealing with it :-)

@thom4parisot
Copy link
Owner

This lead to #71 where it seems to break things.

What is the initial reason of this PR?

Thanks.

@fabrizim
Copy link
Collaborator

I think I was mistaken when I committed this PR. The issue I thought it was resolving is related to this piece of code, but it is actually a problem with the Domain Mapping plugin for multisite installations, and this code would not fix that regardless.

Apologies for not being more careful when committing. I think we should revert this change unless we hear from @villeristi explaining the initial reason for the PR.

@thom4parisot
Copy link
Owner

@fabrizim no worries. I honestly would not have thought it would be an issue just by looking at the code.

thom4parisot pushed a commit that referenced this pull request Nov 2, 2014
This reverts commit fd2251d, reversing
changes made to a798a45.

Conflicts:
	lib/Stylesheet.class.php

closes #71
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants