geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-06-17 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #73 from skipperbent/development

Browse Source 
Development
This commit is contained in:
Simon Sessingø
2016-03-18 17:55:31 +01:00
parent 3d45851d9b 5483ffe458
commit 358b25d4f1
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/Http/Request.php
+12
View File
@@ -154,4 +154,16 @@ class Request {
return $this->loadedRoute;
}
public function isFormatAccepted($format) {
return (isset($_SERVER['HTTP_ACCEPT']) && stripos($_SERVER['HTTP_ACCEPT'], $format) > -1);
}
public function getAcceptFormats() {
if(isset($_SERVER['HTTP_ACCEPT'])) {
return explode(',', $_SERVER['HTTP_ACCEPT']);
}
return array();
}
}
src/Pecee/SimpleRouter/RouterEntry.php
+1 -1
View File
@@ -201,7 +201,7 @@ abstract class RouterEntry {
*/
public function addSettings(array $settings = null) {
if(is_array($settings)) {
$this->settings = array_merge($this->settings, $settings);
$this->settings = array_merge($settings, $this->settings);
}
return $this;
}