diff options
author | ivan <ivan> | 2005-03-12 16:07:29 +0000 |
---|---|---|
committer | ivan <ivan> | 2005-03-12 16:07:29 +0000 |
commit | d069ae1df141abf4a4c2c258e8255b974e730a47 (patch) | |
tree | 47ff3cf60a1ac282ee58786f584699c9b6bfbef1 /rt/lib | |
parent | a6cbda0b7e6779b89abc1d466af9c3a880d8e030 (diff) |
popurl(3) won't give us a good freeside base url since RT calls it from multiple directory depths... have to specify explicity, like external integration
Diffstat (limited to 'rt/lib')
-rw-r--r-- | rt/lib/RT/URI/freeside.pm | 4 | ||||
-rw-r--r-- | rt/lib/RT/URI/freeside/Internal.pm | 6 | ||||
-rw-r--r-- | rt/lib/RT/URI/freeside/XMLRPC.pm | 8 |
3 files changed, 3 insertions, 15 deletions
diff --git a/rt/lib/RT/URI/freeside.pm b/rt/lib/RT/URI/freeside.pm index bd617f907..687f92322 100644 --- a/rt/lib/RT/URI/freeside.pm +++ b/rt/lib/RT/URI/freeside.pm @@ -28,7 +28,7 @@ package RT::URI::freeside; use RT::URI::base; use strict; -use vars qw(@ISA $IntegrationType); +use vars qw(@ISA $IntegrationType $URL); @ISA = qw/RT::URI::base/; @@ -62,7 +62,7 @@ Returns the URL for freeside's web interface. =cut -sub FreesideURL { return undef; } +sub FreesideURL { return $URL; } =item FreesideVersion diff --git a/rt/lib/RT/URI/freeside/Internal.pm b/rt/lib/RT/URI/freeside/Internal.pm index cdadd1ed1..18307792b 100644 --- a/rt/lib/RT/URI/freeside/Internal.pm +++ b/rt/lib/RT/URI/freeside/Internal.pm @@ -86,12 +86,6 @@ sub _FreesideGetRecord { } -sub FreesideURL { - - return popurl(3); - -} - sub FreesideVersion { return $FS::VERSION; diff --git a/rt/lib/RT/URI/freeside/XMLRPC.pm b/rt/lib/RT/URI/freeside/XMLRPC.pm index 618364c00..a8a731fcd 100644 --- a/rt/lib/RT/URI/freeside/XMLRPC.pm +++ b/rt/lib/RT/URI/freeside/XMLRPC.pm @@ -28,7 +28,7 @@ use strict; no warnings qw(redefine); -use vars qw($URL $XMLRPC_URL $_FS_VERSION); +use vars qw($XMLRPC_URL $_FS_VERSION); use Frontier::Client; @@ -95,12 +95,6 @@ sub FreesideGetConfig { } -sub FreesideURL { - - return $URL; - -} - sub FreesideVersion { return $_FS_VERSION if ($_FS_VERSION =~ /^\d+\.\d+\.\d+/); |