diff options
author | Nils Adermann <naderman@naderman.de> | 2014-05-02 13:25:29 +0200 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2014-05-02 13:25:29 +0200 |
commit | fa230b48ec3b9d79687a2e40804afd75ec4915d6 (patch) | |
tree | 4f378c6967e19c876f18a685d64bdd0a11e7e9f4 /phpBB/includes | |
parent | 06e9d8871c17172e0c9d1a531c1cc6995a7cbb07 (diff) | |
parent | c6fd2f01eb334a8a78bebc1cffd0f071fbe056ea (diff) | |
download | forums-fa230b48ec3b9d79687a2e40804afd75ec4915d6.tar forums-fa230b48ec3b9d79687a2e40804afd75ec4915d6.tar.gz forums-fa230b48ec3b9d79687a2e40804afd75ec4915d6.tar.bz2 forums-fa230b48ec3b9d79687a2e40804afd75ec4915d6.tar.xz forums-fa230b48ec3b9d79687a2e40804afd75ec4915d6.zip |
Merge remote-tracking branch 'github-marc1706/ticket/8960-olympus' into develop-olympus
* github-marc1706/ticket/8960-olympus:
[ticket/8960] Allow changing avatar path if it's not writable
Diffstat (limited to 'phpBB/includes')
-rw-r--r-- | phpBB/includes/acp/acp_board.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index ebbf66657e..526d8e05da 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -123,7 +123,7 @@ class acp_board 'avatar_filesize' => array('lang' => 'MAX_FILESIZE', 'validate' => 'int:0', 'type' => 'text:4:10', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']), 'avatar_min' => array('lang' => 'MIN_AVATAR_SIZE', 'validate' => 'int:0', 'type' => 'dimension:3:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), 'avatar_max' => array('lang' => 'MAX_AVATAR_SIZE', 'validate' => 'int:0', 'type' => 'dimension:3:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), - '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), 'avatar_gallery_path' => array('lang' => 'AVATAR_GALLERY_PATH', 'validate' => 'rpath', 'type' => 'text:20:255', 'explain' => true) ) ); |