diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-05-02 13:26:03 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-05-02 13:26:03 +0200 |
| commit | ef0600bfa2bce00fde060af59dfd51a7a958c8d2 (patch) | |
| tree | 8396e343e582f3d93a0eea64a85c583973028619 /phpBB/phpbb | |
| parent | 76574d4b5e6c2f6de0faf175c745bcdc74c60f4e (diff) | |
| parent | 0679a403d538e1c9e1c0c11276755b596a865af8 (diff) | |
| download | forums-ef0600bfa2bce00fde060af59dfd51a7a958c8d2.tar forums-ef0600bfa2bce00fde060af59dfd51a7a958c8d2.tar.gz forums-ef0600bfa2bce00fde060af59dfd51a7a958c8d2.tar.bz2 forums-ef0600bfa2bce00fde060af59dfd51a7a958c8d2.tar.xz forums-ef0600bfa2bce00fde060af59dfd51a7a958c8d2.zip | |
Merge remote-tracking branch 'github-marc1706/ticket/8960' into develop-ascraeus
* github-marc1706/ticket/8960:
[ticket/8960] Allow changing avatar path if it's not writable
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/upload.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index 1e50e135e4..f77ef1332b 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -147,7 +147,7 @@ class upload extends \phpbb\avatar\driver\driver return array( 'allow_avatar_remote_upload'=> array('lang' => 'ALLOW_REMOTE_UPLOAD', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'avatar_filesize' => array('lang' => 'MAX_FILESIZE', 'validate' => 'int:0', 'type' => 'number:0', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']), - 'avatar_path' => array('lang' => 'AVATAR_STORAGE_PATH', 'validate' => 'rwpath', 'type' => 'text:20:255', 'explain' => true), + 'avatar_path' => array('lang' => 'AVATAR_STORAGE_PATH', 'validate' => 'rpath', 'type' => 'text:20:255', 'explain' => true), ); } |