aboutsummaryrefslogtreecommitdiff
path: root/formats
diff options
context:
space:
mode:
Diffstat (limited to 'formats')
-rw-r--r--formats/AtomFormat.php8
-rw-r--r--formats/HtmlFormat.php8
-rw-r--r--formats/JsonFormat.php8
-rw-r--r--formats/MrssFormat.php8
-rw-r--r--formats/PlaintextFormat.php8
5 files changed, 0 insertions, 40 deletions
diff --git a/formats/AtomFormat.php b/formats/AtomFormat.php
index 62ab3818..81aaf441 100644
--- a/formats/AtomFormat.php
+++ b/formats/AtomFormat.php
@@ -156,14 +156,6 @@ EOD;
return $toReturn;
}
- public function display(){
- $this
- ->setContentType(self::MIME_TYPE . '; charset=' . $this->getCharset())
- ->callContentType();
-
- return parent::display();
- }
-
private function xml_encode($text){
return htmlspecialchars($text, ENT_XML1);
}
diff --git a/formats/HtmlFormat.php b/formats/HtmlFormat.php
index b9a7aba1..b3f02099 100644
--- a/formats/HtmlFormat.php
+++ b/formats/HtmlFormat.php
@@ -137,14 +137,6 @@ EOD;
return $toReturn;
}
- public function display() {
- $this
- ->setContentType(self::MIME_TYPE . '; charset=' . $this->getCharset())
- ->callContentType();
-
- return parent::display();
- }
-
private function buildButton($format, $query) {
return <<<EOD
<a href="./?{$query}"><button class="rss-feed">{$format}</button></a>
diff --git a/formats/JsonFormat.php b/formats/JsonFormat.php
index f0aa0e65..90bae863 100644
--- a/formats/JsonFormat.php
+++ b/formats/JsonFormat.php
@@ -122,14 +122,6 @@ class JsonFormat extends FormatAbstract {
return $json;
}
- public function display(){
- $this
- ->setContentType(self::MIME_TYPE . '; charset=' . $this->getCharset())
- ->callContentType();
-
- return parent::display();
- }
-
private function isHTML($text) {
return (strlen(strip_tags($text)) != strlen($text));
}
diff --git a/formats/MrssFormat.php b/formats/MrssFormat.php
index 8bf569ae..0c51104a 100644
--- a/formats/MrssFormat.php
+++ b/formats/MrssFormat.php
@@ -150,14 +150,6 @@ EOD;
return $toReturn;
}
- public function display(){
- $this
- ->setContentType(self::MIME_TYPE . '; charset=' . $this->getCharset())
- ->callContentType();
-
- return parent::display();
- }
-
private function xml_encode($text){
return htmlspecialchars($text, ENT_XML1);
}
diff --git a/formats/PlaintextFormat.php b/formats/PlaintextFormat.php
index 5a0522cf..a1ef9e7f 100644
--- a/formats/PlaintextFormat.php
+++ b/formats/PlaintextFormat.php
@@ -21,12 +21,4 @@ class PlaintextFormat extends FormatAbstract {
$toReturn = mb_convert_encoding($toReturn, $this->getCharset(), 'UTF-8');
return $toReturn;
}
-
- public function display(){
- $this
- ->setContentType(self::MIME_TYPE . '; charset=' . $this->getCharset())
- ->callContentType();
-
- return parent::display();
- }
}