tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Retaining case in PjaxResponseNegotiator, in order to pass back to client correctly

Browse Source
This commit is contained in:
Ingo Schommer 2012-05-30 11:53:54 +02:00
parent 5178954311
commit b3d99d5418
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
control/PjaxResponseNegotiator.php
View File

@ -40,16 +40,12 @@ class PjaxResponseNegotiator {
*/ */
public function respond(SS_HTTPRequest $request, $extraCallbacks = array()) { public function respond(SS_HTTPRequest $request, $extraCallbacks = array()) {
// Prepare the default options and combine with the others // Prepare the default options and combine with the others
$callbacks = array_merge( $callbacks = array_merge($this->callbacks, $extraCallbacks);
array_change_key_case($this->callbacks, CASE_LOWER),
array_change_key_case($extraCallbacks, CASE_LOWER)
);
$response = new SS_HTTPResponse(); $response = new SS_HTTPResponse();
$responseParts = array(); $responseParts = array();
if($fragmentStr = $request->getHeader('X-Pjax')) { if($fragmentStr = $request->getHeader('X-Pjax')) {
$fragments = explode(',', strtolower($fragmentStr)); $fragments = explode(',', $fragmentStr);
foreach($fragments as $fragment) { foreach($fragments as $fragment) {
if(isset($callbacks[$fragment])) { if(isset($callbacks[$fragment])) {
$responseParts[$fragment] = call_user_func($callbacks[$fragment]); $responseParts[$fragment] = call_user_func($callbacks[$fragment]);