diff options
author | Evan Prodromou <evan@status.net> | 2010-10-22 09:24:49 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-10-22 09:24:49 -0400 |
commit | e1e79e62360191626fbb3eae9f5d2af249780ac9 (patch) | |
tree | b9b56dd72d03bcbb71120cc81ac04f002acb531f /actions/designadminpanel.php | |
parent | 13571b32eaa60f09f906296fec1d5d63749eb132 (diff) | |
parent | d6f4588b9ede2cb26b06084b3117ec9184f9e64e (diff) |
Merge remote branch 'gitorious/0.9.x' into 0.9.x
Diffstat (limited to 'actions/designadminpanel.php')
-rw-r--r-- | actions/designadminpanel.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php index 587333e06..321a8ee5e 100644 --- a/actions/designadminpanel.php +++ b/actions/designadminpanel.php @@ -120,8 +120,11 @@ class DesignadminpanelAction extends AdminPanelAction && empty($_POST) && ($_SERVER['CONTENT_LENGTH'] > 0) ) { - $msg = _('The server was unable to handle that much POST ' . - 'data (%s bytes) due to its current configuration.'); + // TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit. + // TRANS: %s is the number of bytes of the CONTENT_LENGTH. + $msg = _m('The server was unable to handle that much POST data (%s byte) due to its current configuration.', + 'The server was unable to handle that much POST data (%s bytes) due to its current configuration.', + intval($_SERVER['CONTENT_LENGTH'])); $this->clientException(sprintf($msg, $_SERVER['CONTENT_LENGTH'])); return; } @@ -258,8 +261,8 @@ class DesignadminpanelAction extends AdminPanelAction function saveBackgroundImage() { $filename = null; - - if ($_FILES['design_background-image_file']['error'] == + if (isset($_FILES['design_background-image_file']['error']) && + $_FILES['design_background-image_file']['error'] == UPLOAD_ERR_OK) { $filepath = null; |