iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge r11508 from branch 2.2 to trunk

Browse Source 
bug 2363 fixed: upgrade 94 should not fail when write access is missing on
_data/plugins. When this situation occurs, we don't save the 2.1 user upload
configuration and we continue the upgrade.



git-svn-id: http://piwigo.org/svn/trunk@11509 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2011-06-25 19:52:18 +00:00
parent 554a5368b5
commit fa9b4f8871
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
install/db/94-database.php
View File

@@ -61,12 +61,28 @@ while ($row = pwg_db_fetch_assoc($result)) {
// save configuration for a future use by the Community plugin
$backup_filepath = $conf['local_data_dir'].'/plugins/core_user_upload_to_community.php';
mkgetdir(dirname($backup_filepath));
$save_conf = true;
if (is_dir(dirname($backup_filepath)))
{
if (!is_writable(dirname($backup_filepath)))
{
$save_conf = false;
}
}
elseif (!is_writable($conf['local_data_dir']))
{
$save_conf = false;
}
file_put_contents(
$backup_filepath,
'<?php $user_upload_conf = \''.serialize($user_upload_conf).'\'; ?>'
);
if ($save_conf)
{
mkgetdir(dirname($backup_filepath));
file_put_contents(
$backup_filepath,
'<?php $user_upload_conf = \''.serialize($user_upload_conf).'\'; ?>'
);
}
//
// remove all what is related to user upload in the database