|
@@ -156,18 +156,18 @@ discard block |
|
|
block discarded – undo |
|
156
|
156
|
$localname = $vocab->getLocalName($uri); |
|
157
|
157
|
if ($localname !== $uri && $localname === urlencode($localname)) { |
|
158
|
158
|
// check that the prefix stripping worked, and there are no problematic chars in localname |
|
159
|
|
- $paramstr = count($params) > 0 ? '?' . http_build_query($params) : ''; |
|
|
159
|
+ $paramstr = count($params) > 0 ? '?'.http_build_query($params) : ''; |
|
160
|
160
|
if ($type && $type !== '' && $type !== 'vocab' && !($localname === '' && $type === 'page')) { |
|
161
|
|
- return "$vocid/$lang/$type/$localname" . $paramstr; |
|
|
161
|
+ return "$vocid/$lang/$type/$localname".$paramstr; |
|
162
|
162
|
} |
|
163
|
163
|
|
|
164
|
|
- return "$vocid/$lang/$localname" . $paramstr; |
|
|
164
|
+ return "$vocid/$lang/$localname".$paramstr; |
|
165
|
165
|
} |
|
166
|
166
|
|
|
167
|
167
|
// case 2: URI outside vocabulary namespace, or has problematic chars |
|
168
|
168
|
// pass the full URI as parameter instead |
|
169
|
169
|
$params['uri'] = $uri; |
|
170
|
|
- return "$vocid/$lang/$type/?" . http_build_query($params); |
|
|
170
|
+ return "$vocid/$lang/$type/?".http_build_query($params); |
|
171
|
171
|
} |
|
172
|
172
|
|
|
173
|
173
|
/** |
|
@@ -321,7 +321,7 @@ discard block |
|
|
block discarded – undo |
|
321
|
321
|
{ |
|
322
|
322
|
if ($modifiedDate) { |
|
323
|
323
|
$ifModifiedSince = $this->getIfModifiedSince(); |
|
324
|
|
- $this->sendHeader("Last-Modified: " . $modifiedDate->format('Y-m-d H:i:s')); |
|
|
324
|
+ $this->sendHeader("Last-Modified: ".$modifiedDate->format('Y-m-d H:i:s')); |
|
325
|
325
|
if ($ifModifiedSince !== null && $ifModifiedSince >= $modifiedDate) { |
|
326
|
326
|
$this->sendHeader("HTTP/1.0 304 Not Modified"); |
|
327
|
327
|
return true; |
Please login to merge, or discard this patch.