Skip to content

Commit

Permalink
Item9161: perltidy
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.foswiki.org/trunk@7809 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
MichaelTempest authored and MichaelTempest committed Jun 15, 2010
1 parent 84846e6 commit d81d9a4
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions core/lib/Foswiki.pm
Original file line number Diff line number Diff line change
Expand Up @@ -1701,6 +1701,7 @@ sub new {
if ( $topic =~ m#^$regex{linkProtocolPattern}://#o
&& $this->{request} )
{

# SMELL: this is a result of Codev.GoBoxUnderstandsURLs,
# an unrequested, undocumented, and AFAICT pretty useless
#"feature". It should be deprecated (or silently removed; I
Expand Down Expand Up @@ -1759,14 +1760,14 @@ sub new {
\&Foswiki::Sandbox::validateTopicName );

# Validate web name from path info
$this->{webName} = Foswiki::Sandbox::untaint( $web,
\&Foswiki::Sandbox::validateWebName );
$this->{webName} =
Foswiki::Sandbox::untaint( $web, \&Foswiki::Sandbox::validateWebName );

if (!defined $this->{webName} && !defined $this->{topicName} ) {
$this->{webName} = $Foswiki::cfg{UsersWebName};
if ( !defined $this->{webName} && !defined $this->{topicName} ) {
$this->{webName} = $Foswiki::cfg{UsersWebName};
$this->{topicName} = $Foswiki::cfg{HomeTopicName};
}

$this->{webName} = ''
unless ( defined $this->{webName} );

Expand Down Expand Up @@ -3429,7 +3430,7 @@ Test if topic exists

sub topicExists {
my ( $this, $web, $topic ) = @_;
ASSERT( UNTAINTED($web), 'web is tainted' ) if DEBUG;
ASSERT( UNTAINTED($web), 'web is tainted' ) if DEBUG;
ASSERT( UNTAINTED($topic), 'topic is tainted' ) if DEBUG;
return $this->{store}->topicExists( $web, $topic );
}
Expand Down

0 comments on commit d81d9a4

Please sign in to comment.