diff options
| author | Amenadiel <amenadiel@gmail.com> | 2017-07-31 21:17:49 +0300 |
|---|---|---|
| committer | Amenadiel <amenadiel@gmail.com> | 2017-07-31 21:17:49 +0300 |
| commit | bf74f5233b261f29a25731213e346f2bcbda9a30 (patch) | |
| tree | d0d3e2480c5d3228084a4ccde0e862c8312b0152 /src/decorators | |
| parent | ffb71fe7c70ddd398f738e807fd895b3457da6c2 (diff) | |
removing a few debug statements
Diffstat (limited to 'src/decorators')
| -rw-r--r-- | src/decorators/BranchUrlDecorator.php | 6 | ||||
| -rw-r--r-- | src/decorators/RedirectUrlDecorator.php | 2 | ||||
| -rw-r--r-- | src/decorators/UrlDecorator.php | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/decorators/BranchUrlDecorator.php b/src/decorators/BranchUrlDecorator.php index efe10b4b..2cebc9e6 100644 --- a/src/decorators/BranchUrlDecorator.php +++ b/src/decorators/BranchUrlDecorator.php @@ -1,6 +1,6 @@ <?php - namespace PHPPgAdmin\Decorators; +namespace PHPPgAdmin\Decorators; class BranchUrlDecorator extends Decorator { @@ -41,9 +41,9 @@ class BranchUrlDecorator extends Decorator $sep = '&'; } } - if (strpos($url, SUBFOLDER) === false) { + if (SUBFOLDER !== '' && (strpos($url, '/') === 0) && (strpos($url, SUBFOLDER) === false)) { $url = str_replace('//', '/', SUBFOLDER . '/' . $url); } return str_replace('.php', '', $url); } - } +} diff --git a/src/decorators/RedirectUrlDecorator.php b/src/decorators/RedirectUrlDecorator.php index 6523256c..cb6822a6 100644 --- a/src/decorators/RedirectUrlDecorator.php +++ b/src/decorators/RedirectUrlDecorator.php @@ -37,7 +37,7 @@ class RedirectUrlDecorator extends Decorator $sep = '&'; } } - if ((strpos($url, '/') === 0) && (strpos($url, SUBFOLDER) === false)) { + if (SUBFOLDER !== '' && (strpos($url, '/') === 0) && (strpos($url, SUBFOLDER) === false)) { $url = str_replace('//', '/', SUBFOLDER . '/' . $url); } return str_replace('.php', '', $url); diff --git a/src/decorators/UrlDecorator.php b/src/decorators/UrlDecorator.php index 58a8cc0a..326b15a6 100644 --- a/src/decorators/UrlDecorator.php +++ b/src/decorators/UrlDecorator.php @@ -30,7 +30,7 @@ class UrlDecorator extends Decorator $sep = '&'; } } - if ((strpos($url, '/') === 0) && (strpos($url, SUBFOLDER) === false)) { + if (SUBFOLDER !== '' && (strpos($url, '/') === 0) && (strpos($url, SUBFOLDER) === false)) { $url = str_replace('//', '/', SUBFOLDER . '/' . $url); } return $url; |