Remove custom cobrand page code - not used

3 files changed, 3 insertions, 50 deletions

diff --git a/perllib/Cobrand.pm b/perllib/Cobrand.pm
index d7a9d0e96..1541f97f4 100644
--- a/perllib/Cobrand.pm
+++ b/perllib/Cobrand.pm
@@ -7,7 +7,7 @@
 # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved.
 # Email: louise@mysociety.org. WWW: http://www.mysociety.org
 #
-# $Id: Cobrand.pm,v 1.51 2009-12-15 14:47:40 louise Exp $
+# $Id: Cobrand.pm,v 1.52 2009-12-15 14:55:52 louise Exp $
 
 package Cobrand;
 use strict;
@@ -47,20 +47,6 @@ sub cobrand_handle {
     return $handles{$cobrand};
 }
 
-
-=item cobrand_page QUERY
-
-Return a string containing the HTML to be rendered for a custom Cobranded page
-
-=cut
-sub cobrand_page {
-    my $q = shift;
-    my $cobrand = $q->{site};
-    my $handle = cobrand_handle($cobrand);
-    return 0 unless $handle;
-    return $handle->page($q);	
-}
-
 =item site_restriction COBRAND COBRAND_DATA
 
 Return a site restriction clause and a site key if the cobrand uses a subset of the FixMyStreet 
diff --git a/perllib/Cobrands/Emptyhomes/Util.pm b/perllib/Cobrands/Emptyhomes/Util.pm
index 6f0708c81..9d9b92903 100644
--- a/perllib/Cobrands/Emptyhomes/Util.pm
+++ b/perllib/Cobrands/Emptyhomes/Util.pm
@@ -7,7 +7,7 @@
 # Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved.
 # Email: louise@mysociety.org. WWW: http://www.mysociety.org
 #
-# $Id: Util.pm,v 1.6 2009-10-20 14:24:59 louise Exp $
+# $Id: Util.pm,v 1.7 2009-12-15 14:55:53 louise Exp $
 
 package Cobrands::Emptyhomes::Util;
 use Standard;
@@ -43,34 +43,6 @@ sub base_url {
    return $base_url;
 }
 
-=item
-
-Return the list of custom pages that can be produced by this module
-
-=cut
-
-sub pages{
-  return qw();
-}
-
-=item page Q
-
-Return HTML for the page specified by the cobrand_page parameter in 
-the query.
-
-=cut
-
-sub page{
-   my $self = shift;
-   my $q = shift;
-   my $page_requested = $q->param('cobrand_page');
-   if (grep ($_ eq $page_requested, $self->pages())){
-      return $self->$page_requested($q);
-   }else{      
-    throw Error::Simple("Unknown page");
-   }
-}
-
 =item set_lang_and_domain LANG UNICODE
 
 Set the language and text domain for the site based on the query and host. 
diff --git a/web/index.cgi b/web/index.cgi
index de54ff226..0dcdd151c 100755
--- a/web/index.cgi
+++ b/web/index.cgi
@@ -6,7 +6,7 @@
 # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org. WWW: http://www.mysociety.org
 #
-# $Id: index.cgi,v 1.331 2009-12-14 16:24:43 louise Exp $
+# $Id: index.cgi,v 1.332 2009-12-15 14:55:53 louise Exp $
 
 use strict;
 use Standard;
@@ -84,11 +84,6 @@ sub main {
     } elsif ($q->param('pc') || ($q->param('x') && $q->param('y'))) {
         ($out, %params) = display_location($q);
         $params{title} = _('Viewing a location');
-    } elsif ($q->param('cobrand_page') && ($q->{site} ne 'fixmystreet')) {
-        ($out, %params) = Cobrand::cobrand_page($q);
-        if (!$out) {
-            $out = front_page($q);
-        }
     } else {
         ($out, %params) = front_page($q);
     }