Doh! Remove the last file, and apply the last patch to to fix templates. Ah, that should be better.

tools/reporter/includes/iolib.inc.php

@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-function initializeTemplate(){
+function initializeTemplate($page = ''){
     global $config;
 
     $object = new Smarty;
@@ -44,7 +44,11 @@ function initializeTemplate(){
     $object->debugging = $config['smarty_debug'];
 
     if ($config['smarty_template_directory']){
-        $object->template_dir = $config['smarty_template_directory'];
+        $subdir = '';
+        if($page == 'layout'){
+            $subdir = '/'.$config['theme'];
+        }
+        $object->template_dir = $config['smarty_template_directory'].$subdir;
     }
     if ($config['smarty_compile_dir']){
         $object->compile_dir = $config['smarty_compile_dir'];
@@ -73,11 +77,11 @@ function templateStandardVars($object){
 function displayPage($object, $path, $objectTemplate, $title = 'Mozilla Reporter'){
     global $config;
 
-    $page = initializeTemplate();
+    $page = initializeTemplate('layout');
     $page->assign('content', $object->fetch($objectTemplate));
     $page->assign('title', $title);
     $page->assign('path', $path);
-    $page->display($config['theme'].'/layout.tpl');
+    $page->display('layout.tpl');
     return;
 }
 function strMiddleReduceWordSensitive($string, $max = 50, $rep = '[...]') {

tools/reporter/index.php

@@ -1,45 +0,0 @@
-<?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Reporter (r.m.o).
- *
- * The Initial Developer of the Original Code is
- *      Robert Accettura <robert@accettura.com>.
- *
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-require_once('config.inc.php');
-require_once($config['base_path'].'/includes/iolib.inc.php');
-
-printheaders();
-header("Location: app");
-
-?>