diff options
| author | pantsucat <contact@pantsu.cat> | 2015-09-19 02:02:36 +0200 |
|---|---|---|
| committer | pantsucat <contact@pantsu.cat> | 2015-09-19 02:02:48 +0200 |
| commit | 274e8063d3761659243044a20ee1dc06f7414fdc (patch) | |
| tree | c095fa2f4e02b2fa27ff8c3209e56c17a766527b /static/classes | |
| parent | a7f18c03cc5f11fb1a86e368bb85f476d30370f1 (diff) | |
| parent | 8574c83cc5043ff9d5951e36d98eab85563e0503 (diff) | |
Resolve merge conflicts
Diffstat (limited to 'static/classes')
| -rwxr-xr-x | static/classes/Response.class.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/static/classes/Response.class.php b/static/classes/Response.class.php index b7e4c5d..c340a4c 100755 --- a/static/classes/Response.class.php +++ b/static/classes/Response.class.php @@ -16,8 +16,7 @@ class Response header('Content-Type: text/plain; charset=UTF-8'); $this->type = $response_type; break; - - case 'html': + case 'html': header('Content-Type: text/html;charset=utf-8'); $this->type = 'html'; break; @@ -129,7 +128,7 @@ class Response private static function html_success($files) { foreach ($files as $file) { - $result .= '<a href="'.$file['url'].'">'.$file['url'].'</a><br>'; + $result .= "<a href=\"".$file['url']."\">".$file['url']."</a><br>"; } return $result; |
