From: Meik S. <acy...@ph...> - 2009-11-16 10:34:42
|
Author: acydburn Date: Mon Nov 16 10:33:51 2009 New Revision: 10272 Log: merge r10271 (late-late fix. :) But good someone at least noticed) Modified: branches/phpBB-3_0_6/phpBB/ (props changed) branches/phpBB-3_0_6/phpBB/install/install_update.php Propchange: branches/phpBB-3_0_6/phpBB/ ------------------------------------------------------------------------------ *** svn:mergeinfo (original) --- svn:mergeinfo Mon Nov 16 10:33:51 2009 *************** *** 1 **** ! /branches/phpBB-3_0_0/phpBB:10260,10262,10267,10269 --- 1 ---- ! /branches/phpBB-3_0_0/phpBB:10260,10262,10267,10269,10271 Modified: branches/phpBB-3_0_6/phpBB/install/install_update.php ============================================================================== *** branches/phpBB-3_0_6/phpBB/install/install_update.php (original) --- branches/phpBB-3_0_6/phpBB/install/install_update.php Mon Nov 16 10:33:51 2009 *************** *** 927,933 **** { if (function_exists('phpbb_is_writable') && !phpbb_is_writable($phpbb_root_path . 'store/')) { ! trigger_error(sprintf($user->lang['DIRECTORY_NOT_WRITABLE'], $phpbb_root_path . 'store/'), E_USER_ERROR); } if ($use_method == '.zip') --- 927,933 ---- { if (function_exists('phpbb_is_writable') && !phpbb_is_writable($phpbb_root_path . 'store/')) { ! trigger_error(sprintf('The directory â%sâ is not writable.', $phpbb_root_path . 'store/'), E_USER_ERROR); } if ($use_method == '.zip') |