aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlouise <louise>2009-12-15 14:47:40 +0000
committerlouise <louise>2009-12-15 14:47:40 +0000
commit6eb3840757706b7f5d6df22dd2a5ffb8ae8b2df3 (patch)
tree8f3ffb8ca84043511a4fdfd3c3f485e6f645aa24
parent773b0d350a83a3f4328dd48593735a086181e593 (diff)
Remove unused functions
-rw-r--r--perllib/Cobrand.pm12
-rw-r--r--perllib/Page.pm4
2 files changed, 8 insertions, 8 deletions
diff --git a/perllib/Cobrand.pm b/perllib/Cobrand.pm
index 18704ed9a..d7a9d0e96 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.50 2009-12-09 13:34:35 louise Exp $
+# $Id: Cobrand.pm,v 1.51 2009-12-15 14:47:40 louise Exp $
package Cobrand;
use strict;
@@ -595,14 +595,14 @@ sub header_params {
}
}
-=item root_path_js COBRAND
+=item root_path_js COBRAND Q
Return some js to set the root path from which AJAX queries should be made
-
-=cut
+based on the cobrand and current query Q
+=cut
sub root_path_js {
- my ($cobrand) = @_;
+ my ($cobrand, $q) = @_;
my $handle;
if ($cobrand){
$handle = cobrand_handle($cobrand);
@@ -610,7 +610,7 @@ sub root_path_js {
if ( !$cobrand || !$handle || !$handle->can('root_path_js')){
return 'var root_path = "";';
} else{
- return $handle->root_path_js();
+ return $handle->root_path_js($q);
}
}
diff --git a/perllib/Page.pm b/perllib/Page.pm
index bbdfd740b..63d0f977a 100644
--- a/perllib/Page.pm
+++ b/perllib/Page.pm
@@ -6,7 +6,7 @@
# Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved.
# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: Page.pm,v 1.222 2009-12-15 10:51:31 louise Exp $
+# $Id: Page.pm,v 1.223 2009-12-15 14:47:40 louise Exp $
#
package Page;
@@ -438,7 +438,7 @@ sub display_map {
my $out = '';
my $cobrand = Page::get_cobrand($q);
- my $root_path_js = Cobrand::root_path_js($cobrand);
+ my $root_path_js = Cobrand::root_path_js($cobrand, $q);
my $cobrand_form_elements = Cobrand::form_elements($cobrand, 'mapForm', $q);
my $img_type;
my $form_action = Cobrand::url($cobrand, '', $q);