Merge pull request #119 from skipperbent/development

Optimised for cli-usage
2026-07-04 16:59:58 +00:00 · 2016-10-28 07:41:21 +02:00 · 2016-10-28 07:40:51 +02:00 · 2016-10-27 19:15:59 +02:00 · 2016-10-27 19:15:38 +02:00
2 changed files with 2 additions and 2 deletions
@@ -96,7 +96,7 @@ class Request {
     * @return string
     */
    public function getIp() {
-        return ((isset($_SERVER['HTTP_X_FORWARDED_FOR']) && strlen($_SERVER['HTTP_X_FORWARDED_FOR'])) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR']);
+        return ((isset($_SERVER['HTTP_X_FORWARDED_FOR']) && strlen($_SERVER['HTTP_X_FORWARDED_FOR'])) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null);
    }

    /**
@@ -303,7 +303,7 @@ class RouterBase {

    public function arrayToParams(array $getParams = null, $includeEmpty = true) {

-        if(is_array($getParams)) {
+        if(is_array($getParams) && count($getParams)) {
            if ($includeEmpty === false) {
                $getParams = array_filter($getParams, function ($item) {
                    return (!empty($item));
Author	SHA1	Message	Date
Simon Sessingø	9fed6ffb3f	Merge pull request #119 from skipperbent/development Optimised for cli-usage	2016-10-28 07:41:21 +02:00
Simon Sessingø	832aff0358	Optimised for cli-usage	2016-10-28 07:40:51 +02:00
Simon Sessingø	15da599e82	Merge pull request #118 from skipperbent/development Minor optimisations	2016-10-27 19:15:59 +02:00
Simon Sessingø	43e05ad821	Minor optimisations	2016-10-27 19:15:38 +02:00