adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-06 16:53:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug 2725: Piwigo isn't compatible with suPHP + better handling of watermark upload errors merge from trunk to branch 2.4

Browse Source 
git-svn-id: http://piwigo.org/svn/branches/2.4@17676 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2012-08-30 19:20:50 +00:00
parent 2c24b0b38a
commit a2f73718d9
6 changed files with 25 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/template.class.php
+3 -23
View File
@@ -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();