Ticket #1934: wp-db-backup.diff

wp-db-backup.php

@@ -19 +19 @@
 
 $rand = substr( md5( md5( DB_PASSWORD ) ), -5 );
 
-define('WP_BACKUP_DIR', 'wp-content/backup-' . $rand);
+define('WP_BACKUP_DIR', 'wp-content/backup/' . $rand);
 
 define('ROWS_PER_SEGMENT', 100);
 
@@ -739 +739 @@
                         if ( @ mkdir( ABSPATH . $this->backup_dir) ) {
                                 @ chmod( ABSPATH . $this->backup_dir, $dir_perms);
                         } else {
-                                echo '<div class="updated error"><p align="center">' . __('WARNING: Your wp-content directory is <strong>NOT</strong> writable! We can not create the backup directory.', 'wp-db-backup') . '<br />' . ABSPATH . "</p></div>";
+                                echo '<div class="updated error"><p align="center">' . __('WARNING: Your <code>/wp-content/backup/</code> directory is <strong>NOT</strong> writable! We cannot create the backup directory:', 'wp-db-backup') . '<br />' . ABSPATH . WP_BACKUP_DIR . "</p></div>";
+                                die();
                         $WHOOPS = TRUE;
                         }
                 }
                 
                 if ( !is_writable( ABSPATH . $this->backup_dir) ) {
-                        echo '<div class="updated error"><p align="center">' . __('WARNING: Your backup directory is <strong>NOT</strong> writable! We can not create the backup directory.', 'wp-db-backup') . '<br />' . ABSPATH . "</p></div>";
+                        echo '<div class="updated error"><p align="center">' . __('WARNING: Your backup directory is <strong>NOT</strong> writable! We cannot create the backup directory:', 'wp-db-backup') . '<br />' . ABSPATH . WP_BACKUP_DIR . "</p></div>";
                 }
 
                 if ( !file_exists( ABSPATH . $this->backup_dir . 'index.php') ) {
@@ -880 +881 @@
 
 $mywpdbbackup = new wpdbBackup();
 
-?>
- No newline at end of file
+?>