move var -> share
This commit is contained in:
parent
894385396c
commit
e4792fe9d9
11 changed files with 6 additions and 6 deletions
|
|
@ -73,7 +73,7 @@ sub getFile {
|
|||
if ($self->getStorageId) {
|
||||
return WebGUI::Storage->get($self->session, $self->getStorageId)->getPath($self->getFilename);
|
||||
} else {
|
||||
return WebGUI::Paths->var . '/default.ttf';
|
||||
return WebGUI::Paths->share . '/default.ttf';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ Returns the base directory of the default site uploads content.
|
|||
|
||||
Returns the file path of the default site create.sql script.
|
||||
|
||||
=head2 var
|
||||
=head2 share
|
||||
|
||||
Returns the base directory for WebGUI auxiliary files.
|
||||
|
||||
|
|
@ -102,12 +102,12 @@ BEGIN {
|
|||
spectreConfig => catfile($root, 'etc', 'spectre.conf'),
|
||||
preloadCustom => catfile($root, 'etc', 'preload.custom'),
|
||||
preloadExclusions => catfile($root, 'etc', 'preload.exclude'),
|
||||
upgrades => catdir($root, 'var', 'upgrades'),
|
||||
upgrades => catdir($root, 'share', 'upgrades'),
|
||||
extras => catdir($root, 'www', 'extras'),
|
||||
defaultUploads => catdir($root, 'www', 'uploads'),
|
||||
defaultCreateSQL => catdir($root, 'docs', 'create.sql'),
|
||||
var => catdir($root, 'var'),
|
||||
defaultPSGI => catdir($root, 'var', 'site.psgi'),
|
||||
share => catdir($root, 'share'),
|
||||
defaultPSGI => catdir($root, 'share', 'site.psgi'),
|
||||
);
|
||||
my $meta = Class::MOP::Class->initialize(__PACKAGE__);
|
||||
for my $sub (keys %paths) {
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@ sub addFileFromCaptcha {
|
|||
$self->session->errorHandler->warn("Error adding noise: $error");
|
||||
}
|
||||
# AddNoise generates a different average color depending on library. This is ugly, but the best I can see for now
|
||||
$error = $image->Annotate(font=>WebGUI::Paths->var.'/default.ttf', pointsize=>40, skewY=>0, skewX=>0, gravity=>'center', fill=>'#ffffff', antialias=>'true', text=>$challenge);
|
||||
$error = $image->Annotate(font=>WebGUI::Paths->share.'/default.ttf', pointsize=>40, skewY=>0, skewX=>0, gravity=>'center', fill=>'#ffffff', antialias=>'true', text=>$challenge);
|
||||
if($error) {
|
||||
$self->session->errorHandler->warn("Error Annotating image: $error");
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue