Permalink
Browse files

Fix #8504: Use is_blank() not '' to check empty path in file_add()

  • Loading branch information...
dregad committed Oct 18, 2011
1 parent 52ac5d2 commit ac8630bb2796d13e28f0f57672f54ee81e605595
Showing with 11 additions and 10 deletions.
  1. +11 −10 core/file_api.php
View
@@ -646,10 +646,11 @@ function file_add( $p_bug_id, $p_file, $p_table = 'bug', $p_title = '', $p_desc
$t_file_path = config_get( 'absolute_path_default_upload_folder' );
} else {
$t_file_path = project_get_field( $t_project_id, 'file_path' );
- if( $t_file_path == '' ) {
+ if( is_blank( $t_file_path ) ) {
$t_file_path = config_get( 'absolute_path_default_upload_folder' );
}
}
+
$c_file_path = db_prepare_string( $t_file_path );
$c_new_file_name = db_prepare_string( $t_file_name );
@@ -848,26 +849,26 @@ function file_get_extension( $p_filename ) {
}
/**
- *
+ *
* Copies all attachments from the source bug to the destination bug
- *
+ *
* <p>Does not perform history logging and does not perform access checks.</p>
- *
+ *
* @param int $p_source_bug_id
* @param int $p_dest_bug_id
*/
function file_copy_attachments( $p_source_bug_id, $p_dest_bug_id ) {
-
+
$t_mantis_bug_file_table = db_get_table( 'mantis_bug_file_table' );
-
+
$query = 'SELECT * FROM ' . $t_mantis_bug_file_table . ' WHERE bug_id = ' . db_param();
$result = db_query_bound( $query, Array( $p_source_bug_id ) );
$t_count = db_num_rows( $result );
-
+
$t_bug_file = array();
for( $i = 0;$i < $t_count;$i++ ) {
$t_bug_file = db_fetch_array( $result );
-
+
# prepare the new diskfile name and then copy the file
$t_file_path = dirname( $t_bug_file['folder'] );
$t_new_diskfile_name = $t_file_path . file_generate_unique_name( 'bug-' . $t_bug_file['filename'], $t_file_path );
@@ -876,7 +877,7 @@ function file_copy_attachments( $p_source_bug_id, $p_dest_bug_id ) {
copy( $t_bug_file['diskfile'], $t_new_diskfile_name );
chmod( $t_new_diskfile_name, config_get( 'attachments_file_permissions' ) );
}
-
+
$query = "INSERT INTO $t_mantis_bug_file_table
( bug_id, title, description, diskfile, filename, folder, filesize, file_type, date_added, content )
VALUES ( " . db_param() . ",
@@ -891,4 +892,4 @@ function file_copy_attachments( $p_source_bug_id, $p_dest_bug_id ) {
" . db_param() . ");";
db_query_bound( $query, Array( $p_dest_bug_id, $t_bug_file['title'], $t_bug_file['description'], $t_new_diskfile_name, $t_new_file_name, $t_bug_file['folder'], $t_bug_file['filesize'], $t_bug_file['file_type'], $t_bug_file['date_added'], $t_bug_file['content'] ) );
}
-}
+}

0 comments on commit ac8630b

Please sign in to comment.