From a2f73718d9588a2b6185e73aa683cecd9f990363 Mon Sep 17 00:00:00 2001 From: rvelices Date: Thu, 30 Aug 2012 19:20:50 +0000 Subject: bug 2725: Piwigo isn't compatible with suPHP + better handling of watermark upload errors merge from trunk to branch 2.4 git-svn-id: http://piwigo.org/svn/branches/2.4@17676 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/template.class.php | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) (limited to 'include/template.class.php') diff --git a/include/template.class.php b/include/template.class.php index 3bc386c80..6d81b7169 100644 --- a/include/template.class.php +++ b/include/template.class.php @@ -78,28 +78,6 @@ class Template { } } - if (!isset($conf['combined_dir_checked'])) - { - $dir = PHPWG_ROOT_PATH.PWG_COMBINED_DIR; - mkgetdir($dir, MKGETDIR_DEFAULT&~MKGETDIR_DIE_ON_ERROR); - if (!is_writable($dir)) - { - load_language('admin.lang'); - fatal_error( - sprintf( - l10n('Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'), - PWG_COMBINED_DIR - ), - l10n('an error happened'), - false // show trace - ); - } - if (function_exists('pwg_query')) { - conf_update_param('combined_dir_checked', 1); - } - } - - $compile_dir = PHPWG_ROOT_PATH.$conf['data_location'].'templates_c'; mkgetdir( $compile_dir ); @@ -1343,7 +1321,9 @@ final class FileCombiner $output .= "\n"; } - file_put_contents( PHPWG_ROOT_PATH . $file, $output ); + mkgetdir( dirname(PHPWG_ROOT_PATH.$file) ); + file_put_contents( PHPWG_ROOT_PATH.$file, $output ); + @chmod(PHPWG_ROOT_PATH.$file, 0644); $out_file = $file; $out_version = false; $this->clear(); -- cgit v1.2.3