projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
CGI.pm
diff --git
a/FS/FS/CGI.pm
b/FS/FS/CGI.pm
index
5ac31db
..
fc0f652
100644
(file)
--- a/
FS/FS/CGI.pm
+++ b/
FS/FS/CGI.pm
@@
-244,17
+244,13
@@
sub rooturl {
$url_string =~
s{
/
$url_string =~
s{
/
- (browse|config|docs|edit|graph|misc|search|view|loginout|pref|
elements|
rt|torrus)
+ (browse|config|docs|edit|graph|misc|search|view|loginout|pref|rt|torrus)
(/process)?
([\w\-\.\/]*)
$
}
{}x;
(/process)?
([\w\-\.\/]*)
$
}
{}x;
- #elements because of progress-popup.html...
- #XXX remove anything from elements that is called directly & prevent
- #those pages from being served up
-
$url_string .= '/' unless $url_string =~ /\/$/;
$url_string;
$url_string .= '/' unless $url_string =~ /\/$/;
$url_string;