Allow KCFinder to send back a json encoded response instead of string… #203
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
colemanw
reviewed
Apr 26, 2018
kcfinder/core/class/uploader.php
Outdated
| if (!isset($js)) | ||
| if ($this->outputFormat == 'json') { | ||
| $json = $this->callBack_json($url, $message); | ||
| echo json_encode($json); |
There was a problem hiding this comment.
I think we should set a content type header here.
There was a problem hiding this comment.
@colemanw what would you recommend for content type?
colemanw
reviewed
Apr 27, 2018
kcfinder/core/class/uploader.php
Outdated
| header("Content-Type: text/html; charset={$this->charset}"); | ||
| echo "<html><body>$js</body></html>"; | ||
| } | ||
| } |
There was a problem hiding this comment.
There's something odd going on here. The deleted line on 762 has no opening bracket, but the line you aded on 778 does. I think that may be causing the odd behavior.
colemanw
reviewed
Apr 27, 2018
kcfinder/core/class/uploader.php
Outdated
| header("Content-Type: text/html; charset={$this->charset}"); | ||
| echo "<html><body>$js</body></html>"; | ||
| header("Content-Type: text/html; charset={$this->charset}"); | ||
| echo "<html><body>$js</body></html>"; |
There was a problem hiding this comment.
The above 2 lines should not be inside that conditional. The original version of this file only has 1 line "inside" the conditional (the if statement doesn't have brackets).
… javascript Add in Content-Type header as per Coleman
seamuslee001
force-pushed
the
kcfinder_json
branch
from
6cb2b81
to
3d69720
Compare
|
thanks @colemanw should be fixed now me thinks |
|
This looks good now and is working correctly according to my testing. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
… javascript
ping @colemanw