wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x

Browse Source
This commit is contained in:
Evan Prodromou 2009-06-24 14:13:42 -07:00
commit 07486089d8
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/groupdesignsettings.php
View File

@ -238,7 +238,6 @@ class GroupDesignSettingsAction extends DesignSettingsAction
$design->sidebarcolor = $sbcolor->intValue(); $design->sidebarcolor = $sbcolor->intValue();
$design->textcolor = $tcolor->intValue(); $design->textcolor = $tcolor->intValue();
$design->linkcolor = $lcolor->intValue(); $design->linkcolor = $lcolor->intValue();
$design->backgroundimage = $filepath;
$design->setDisposition($on, $off, $tile); $design->setDisposition($on, $off, $tile);
@ -263,7 +262,6 @@ class GroupDesignSettingsAction extends DesignSettingsAction
$design->sidebarcolor = $sbcolor->intValue(); $design->sidebarcolor = $sbcolor->intValue();
$design->textcolor = $tcolor->intValue(); $design->textcolor = $tcolor->intValue();
$design->linkcolor = $lcolor->intValue(); $design->linkcolor = $lcolor->intValue();
$design->backgroundimage = $filepath;
$design->setDisposition($on, $off, $tile); $design->setDisposition($on, $off, $tile);

2
actions/userdesignsettings.php
View File

@ -149,7 +149,6 @@ class UserDesignSettingsAction extends DesignSettingsAction
$design->sidebarcolor = $sbcolor->intValue(); $design->sidebarcolor = $sbcolor->intValue();
$design->textcolor = $tcolor->intValue(); $design->textcolor = $tcolor->intValue();
$design->linkcolor = $lcolor->intValue(); $design->linkcolor = $lcolor->intValue();
$design->backgroundimage = $filepath;
$design->setDisposition($on, $off, $tile); $design->setDisposition($on, $off, $tile);
@ -174,7 +173,6 @@ class UserDesignSettingsAction extends DesignSettingsAction
$design->sidebarcolor = $sbcolor->intValue(); $design->sidebarcolor = $sbcolor->intValue();
$design->textcolor = $tcolor->intValue(); $design->textcolor = $tcolor->intValue();
$design->linkcolor = $lcolor->intValue(); $design->linkcolor = $lcolor->intValue();
$design->backgroundimage = $filepath;
$design->setDisposition($on, $off, $tile); $design->setDisposition($on, $off, $tile);

16
lib/designsettings.php
View File

@ -132,13 +132,13 @@ class DesignSettingsAction extends AccountSettingsAction
_('Off')); _('Off'));
$this->element('p', 'form_guide', _('Turn background image on or off.')); $this->element('p', 'form_guide', _('Turn background image on or off.'));
$this->elementEnd('li'); $this->elementEnd('li');
}
$this->elementStart('li'); $this->elementStart('li');
$this->checkbox('design_background-image_repeat', $this->checkbox('design_background-image_repeat',
_('Tile background image'), _('Tile background image'),
($design->disposition & BACKGROUND_TILE) ? true : false ); ($design->disposition & BACKGROUND_TILE) ? true : false );
$this->elementEnd('li'); $this->elementEnd('li');
}
$this->elementEnd('ul'); $this->elementEnd('ul');
$this->elementEnd('fieldset'); $this->elementEnd('fieldset');
@ -388,7 +388,11 @@ class DesignSettingsAction extends AccountSettingsAction
$original = clone($design); $original = clone($design);
$design->backgroundimage = $filename; $design->backgroundimage = $filename;
// default to on, no tile
$design->setDisposition(true, false, false); $design->setDisposition(true, false, false);
$result = $design->update($original); $result = $design->update($original);
if ($result === false) { if ($result === false) {

3
lib/imagefile.php
View File

@ -72,7 +72,8 @@ class ImageFile
break; break;
case UPLOAD_ERR_INI_SIZE: case UPLOAD_ERR_INI_SIZE:
case UPLOAD_ERR_FORM_SIZE: case UPLOAD_ERR_FORM_SIZE:
throw new Exception(sprintf(_('That file is too big. The maximum file size is %d.'), $this->maxFileSize())); throw new Exception(sprintf(_('That file is too big. The maximum file size is %d.'),
ImageFile::maxFileSize()));
return; return;
case UPLOAD_ERR_PARTIAL: case UPLOAD_ERR_PARTIAL:
@unlink($_FILES[$param]['tmp_name']); @unlink($_FILES[$param]['tmp_name']);