From 1cfbe8d16e08195c9ca291f2d12ad5909dbedcdc Mon Sep 17 00:00:00 2001 From: Eliot Whalan Date: Mon, 30 May 2016 09:10:27 +1000 Subject: Revert "Merge branch 'wub/deprecate-ewhal'" This reverts commit 647d32a29978579f88baa7c06c207e6a8d6a0d3e, reversing changes made to 22063af06536671b680fa9bc84b4626192c106cc. --- pages/check_script.swig | 11 ++--------- pages/nav.swig | 1 - pages/nojs.swig | 5 ----- pages/other.swig | 5 ----- pages/upload_form_nojs.swig | 5 ----- static/classes/Response.class.php | 18 ++++-------------- 6 files changed, 6 insertions(+), 39 deletions(-) diff --git a/pages/check_script.swig b/pages/check_script.swig index d612980..224c547 100644 --- a/pages/check_script.swig +++ b/pages/check_script.swig @@ -1,7 +1,5 @@ {# -Copyright (c) 2013 Eric Johansson -Copyright (c) 2013 Peter Lejeck -Copyright (c) 2015, 2016 the Pantsu.cat developers +Copyright (c) 2015 the Pantsu.cat developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in @@ -21,11 +19,6 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #} -{# -JavaScript-free uploader is deprecated since 2.1.0. It may be removed in a -future release. -#} - diff --git a/pages/nav.swig b/pages/nav.swig index fb1344a..9bad2af 100644 --- a/pages/nav.swig +++ b/pages/nav.swig @@ -26,7 +26,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. {# tools.html is deprecated since 2.1.0. #}
  • Tools
  • Git
    • - {# other.html is deprecated since 2.1.0. #}
  • Other
  • Transparency
    • diff --git a/pages/nojs.swig b/pages/nojs.swig index 46eb08c..5552b11 100644 --- a/pages/nojs.swig +++ b/pages/nojs.swig @@ -20,11 +20,6 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #} -{# -This template is deprecated since version 2.1.0. It may be removed in a future -release. -#} - {% extends "layout.swig" %} {% block body %} diff --git a/pages/other.swig b/pages/other.swig index 9fb129d..a664aa5 100644 --- a/pages/other.swig +++ b/pages/other.swig @@ -20,11 +20,6 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #} -{# -This template is deprecated since version 2.1.0. It may be removed in a future -release. -#} - {% extends "layout.swig" %} {% block title %}Other Services{% endblock %} diff --git a/pages/upload_form_nojs.swig b/pages/upload_form_nojs.swig index efb0978..1952a0d 100644 --- a/pages/upload_form_nojs.swig +++ b/pages/upload_form_nojs.swig @@ -19,11 +19,6 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #} -{# -This template is deprecated since version 2.1.0. It may be removed in a future -release. -#} -
    diff --git a/static/classes/Response.class.php b/static/classes/Response.class.php index 03dfad7..48b9b58 100755 --- a/static/classes/Response.class.php +++ b/static/classes/Response.class.php @@ -58,7 +58,6 @@ class Response $this->type = $response_type; break; case 'html': - // Deprecated since version 2.1.0 header('Content-Type: text/html; charset=UTF-8'); $this->type = $response_type; break; @@ -72,7 +71,6 @@ class Response $this->type = 'text'; break; case 'text': - // Deprecated since version 2.1.0 header('Content-Type: text/plain; charset=UTF-8'); $this->type = $response_type; break; @@ -100,14 +98,12 @@ class Response $response = $this->csv_error($desc); break; case 'html': - // Deprecated since version 2.1.0 $response = $this->html_error($code, $desc); break; case 'json': $response = $this->json_error($code, $desc); break; case 'text': - // Deprecated since version 2.1.0 $response = $this->text_error($code, $desc); break; } @@ -131,14 +127,12 @@ class Response $response = $this->csv_success($files); break; case 'html': - // Deprecated since version 2.1.0 $response = $this->html_success($files); break; case 'json': $response = $this->json_success($files); break; case 'text': - // Deprecated since version 2.1.0 $response = $this->text_success($files); break; } @@ -182,8 +176,7 @@ class Response /** * Indicates with HTML body the request was invalid. * - * @deprecated 2.1.0 May be removed in a major release or renamed to - * camelCase format. + * @deprecated 2.1.0 Will be renamed to camelCase format. * @param int $code HTTP status code number. * @param int $description Descriptive error message. * @return string Error message in HTML format. @@ -196,8 +189,7 @@ class Response /** * Indicates with HTML body the request was successful. * - * @deprecated 2.1.0 May be removed in a major release or renamed to - * camelCase format. + * @deprecated 2.1.0 Will be renamed to camelCase format. * @param mixed[] $files * @return string Success message in HTML format. */ @@ -247,8 +239,7 @@ class Response /** * Indicates with plain text body the request was invalid. * - * @deprecated 2.1.0 May be removed in a major release or renamed to - * camelCase format. + * @deprecated 2.1.0 Will be renamed to camelCase format. * @param int $code HTTP status code number. * @param int $description Descriptive error message. * @return string Error message in plain text format. @@ -261,8 +252,7 @@ class Response /** * Indicates with plain text body the request was successful. * - * @deprecated 2.1.0 May be removed in a major release or renamed to - * camelCase format. + * @deprecated 2.1.0 Will be renamed to camelCase format. * @param mixed[] $files * @return string Success message in plain text format. */ -- cgit v1.2.3