From a300cb7ed2c1a955863908243ea0b6da09d8fc77 Mon Sep 17 00:00:00 2001
From: Daniel Kinzler <daniel.kinzler@wikimedia.de>
Date: Fri, 30 Mar 2012 12:47:05 +0000
Subject: [PATCH] clean up comments & hints

---
 includes/Content.php        | 20 +++++++++++---------
 includes/ContentHandler.php | 13 -------------
 includes/ImagePage.php      |  4 +++-
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/includes/Content.php b/includes/Content.php
index 1ec4b0c569..913eb067c8 100644
--- a/includes/Content.php
+++ b/includes/Content.php
@@ -214,22 +214,24 @@ abstract class Content {
         return $this;
     }
 
-    #TODO: implement specialized ParserOutput for Wikidata model
-    #TODO: provide "combined" ParserOutput for Multipart... somehow.
-
-    # XXX: isCacheable( ) # can/should we do this here?
-
-    # TODO: EditPage::getPreloadedText( $preload ) // $wgParser->getPreloadText
-    # TODO: tie into EditPage, make it use Content-objects throughout, make edit form aware of content model and format
-    # TODO: make model-aware diff view!
+    # TODO: minimize special cases for CSS/JS; how to handle extra message for JS/CSS previews??
     # TODO: handle ImagePage and CategoryPage
+    # TODO: hook into dump generation to serialize and record model and format!
 
-    # TODO: Title::newFromRedirectRecurse( $this->getRawText() );
+    # TODO: make sure we cover lucene search / wikisearch.
+    # TODO: make sure ReplaceTemplates still works
+    # TODO: nice&sane integration of GeSHi syntax highlighting
+    #   [11:59] <vvv> Hooks are ugly; make CodeHighlighter interface and a config to set the class which handles syntax highlighting
+    #   [12:00] <vvv> And default it to a DummyHighlighter
+
+    # TODO: make sure we cover the external editor interface (does anyone actually use that?!)
 
     # TODO: tie into API to provide contentModel for Revisions
     # TODO: tie into API to provide serialized version and contentFormat for Revisions
     # TODO: tie into API edit interface
+    # TODO: make EditForm plugin for EditPage
 
+    # XXX: isCacheable( ) # can/should we do this here?
 }
 
 /**
diff --git a/includes/ContentHandler.php b/includes/ContentHandler.php
index 91ebeb4aaa..3424e5eb44 100644
--- a/includes/ContentHandler.php
+++ b/includes/ContentHandler.php
@@ -444,19 +444,6 @@ abstract class ContentHandler {
 
         return $undone_content;
     }
-
-    #TODO: how to handle extra message for JS/CSS previews??
-    #TODO: Article::showCssOrJsPage ---> specialized classes!
-
-    #XXX: ImagePage and CategoryPage... wrappers that use ContentHandler? or ContentHandler creates wrappers?
-
-    #TODO: hook into dump generation to serialize and record model and format!
-    #TODO: cover action=raw
-    #TODO: make sure we cover lucene search / wikisearch.
-    #TODO: nice&sane integration of GeSHi syntax highlighting
-    #   [11:59] <vvv> Hooks are ugly; make CodeHighlighter interface and a config to set the class which handles syntax highlighting
-    #   [12:00] <vvv> And default it to a DummyHighlighter
-    #TODO: make sure we cover the external editor interface (does anyone actually use that?!)
 }
 
 
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index cd086c73d7..d9ea13c1a3 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -134,7 +134,9 @@ class ImagePage extends Article {
 			$wgOut->addHTML( Xml::openElement( 'div', array( 'id' => 'mw-imagepage-content',
 				'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir(),
 				'class' => 'mw-content-'.$pageLang->getDir() ) ) );
-			parent::view();
+
+            parent::view(); #FIXME: use ContentHandler::makeArticle() !!
+
 			$wgOut->addHTML( Xml::closeElement( 'div' ) );
 		} else {
 			# Just need to set the right headers
-- 
2.20.1