2c2
< index 133d64f..3248b3a 100644
---
> index cbddc61..d913a03 100644
14c14
< @@ -578,255 +576,6 @@ function file_save_htaccess($directory, $private = TRUE) {
---
> @@ -578,247 +576,6 @@ function file_save_htaccess($directory, $private = TRUE) {
20,27c20,21
< - * @param array|bool $fids
< - *   An array of file IDs, or FALSE to load all files.
< - * @param array $conditions
< - *   (deprecated) An associative array of conditions on the {file_managed}
< - *   table, where the keys are the database fields and the values are the
< - *   values those fields must have. Instead, it is preferable to use
< - *   Drupal\entity\EntityFieldQuery to retrieve a list of entity IDs
< - *   loadable by this function.
---
> - * @param array $fids
> - *   (optional) An array of entity IDs. If omitted, all entities are loaded.
32,33d25
< - * @todo Remove $conditions in Drupal 8.
< - *
39,40c31,32
< -function file_load_multiple($fids = array(), array $conditions = array()) {
< -  return entity_load_multiple('file', $fids, $conditions);
---
> -function file_load_multiple(array $fids = NULL) {
> -  return entity_load_multiple('file', $fids);
56c48
< -  $files = file_load_multiple(array($fid), array());
---
> -  $files = file_load_multiple(array($fid));
243c235
< -      $existing_files = file_load_multiple(array(), array('uri' => $uri));
---
> -      $existing_files = entity_load_multiple_by_properties('file', array('uri' => $uri));
270c262
< @@ -1001,86 +750,6 @@ function file_destination($destination, $replace) {
---
> @@ -993,86 +750,6 @@ function file_destination($destination, $replace) {
325c317
< -      $existing_files = file_load_multiple(array(), array('uri' => $uri));
---
> -      $existing_files = entity_load_multiple_by_properties('file', array('uri' => $uri));
357c349
< @@ -1617,267 +1286,6 @@ function drupal_move_uploaded_file($filename, $uri) {
---
> @@ -1609,267 +1286,6 @@ function drupal_move_uploaded_file($filename, $uri) {
602c594
< -      $existing_files = file_load_multiple(array(), array('uri' => $uri));
---
> -      $existing_files = entity_load_multiple_by_properties('file', array('uri' => $uri));
625c617
< @@ -2451,36 +1859,5 @@ function file_directory_temp() {
---
> @@ -2443,36 +1859,5 @@ function file_directory_temp() {
685c677
< index 7f20d83..b4c2d2b 100644
---
> index 71039b1..2edf4b1 100644
1009c1001
< index 24dd94f..69ab399 100644
---
> index d2f6f76..1f3d029 100644
1021c1013
< @@ -86,6 +86,651 @@ function file_element_info() {
---
> @@ -86,6 +86,638 @@ function file_element_info() {
1043,1044d1034
< +
< +
1048,1055c1038,1039
< + * @param array|bool $fids
< + *   An array of file IDs, or FALSE to load all files.
< + * @param array $conditions
< + *   (deprecated) An associative array of conditions on the {file_managed}
< + *   table, where the keys are the database fields and the values are the
< + *   values those fields must have. Instead, it is preferable to use
< + *   Drupal\entity\EntityFieldQuery to retrieve a list of entity IDs
< + *   loadable by this function.
---
> + * @param array $fids
> + *   (optional) An array of entity IDs. If omitted, all entities are loaded.
1060,1061d1043
< + * @todo Remove $conditions in Drupal 8.
< + *
1067,1068c1049,1050
< +function file_load_multiple($fids = array(), array $conditions = array()) {
< +  return entity_load_multiple('file', $fids, $conditions);
---
> +function file_load_multiple(array $fids = NULL) {
> +  return entity_load_multiple('file', $fids);
1084c1066
< +  $files = file_load_multiple(array($fid), array());
---
> +  $files = file_load_multiple(array($fid));
1271c1253
< +      $existing_files = file_load_multiple(array(), array('uri' => $uri));
---
> +      $existing_files = entity_load_multiple_by_properties('file', array('uri' => $uri));
1294d1275
< +
1347c1328
< +      $existing_files = file_load_multiple(array(), array('uri' => $uri));
---
> +      $existing_files = entity_load_multiple_by_properties('file', array('uri' => $uri));
1375d1355
< +
1618c1598
< +      $existing_files = file_load_multiple(array(), array('uri' => $uri));
---
> +      $existing_files = entity_load_multiple_by_properties('file', array('uri' => $uri));
1637d1616
< +
1673c1652
< @@ -226,6 +871,35 @@ function file_file_download($uri, $field_type = 'file') {
---
> @@ -235,6 +867,35 @@ function file_file_download($uri, $field_type = 'file') {
1709c1688
< @@ -782,7 +1456,7 @@ function theme_file_icon($variables) {
---
> @@ -791,7 +1452,7 @@ function theme_file_icon($variables) {
1718c1697
< @@ -801,7 +1475,7 @@ function file_icon_url(File $file, $icon_directory = NULL) {
---
> @@ -810,7 +1471,7 @@ function file_icon_url(File $file, $icon_directory = NULL) {
1727c1706
< @@ -854,7 +1528,7 @@ function file_icon_path(File $file, $icon_directory = NULL) {
---
> @@ -863,7 +1524,7 @@ function file_icon_path(File $file, $icon_directory = NULL) {
1736c1715
< @@ -986,7 +1660,7 @@ function file_icon_map(File $file) {
---
> @@ -995,7 +1656,7 @@ function file_icon_map(File $file) {
1953c1932
< index e3cbd14..1f152e7 100644
---
> index 62033a9..833c260 100644
2077c2056
< index 2cccaec..c0befba 100644
---
> index f5391b7..c2adbd6 100644
2291c2270
< index 7f88f3f..6f3dd33 100644
---
> index cd0d483..82d7d3f 100644
3118c3097
< index 3c434ae..51216a6 100644
---
> index de7241f..3b28a42 100644
3148c3127
< @@ -3345,30 +3325,6 @@ function system_cron() {
---
> @@ -3349,30 +3329,6 @@ function system_cron() {
3215c3194
< index 535a579..6b84cf7 100644
---
> index 4217234..787def9 100644
3218c3197
< @@ -1,7 +1,7 @@
---
> @@ -1,8 +1,8 @@
3222a3202
>  use Drupal\entity\EntityInterface;