Changeset 11509 for trunk/install/db

Timestamp:

Jun 25, 2011, 9:52:18 PM (13 years ago)

Author:

plg

Message:

merge r11508 from branch 2.2 to trunk

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.

File:

• trunk/install/db/94-database.php (modified) (1 diff)

trunk/install/db/94-database.php

@@ -62 +62 @@
 // 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).'\'; ?>'
+    );
+}
 
 //