Merge pull request #751 from ExpressionEngine/feature/7.x/file-entries-folder-param

Added `{folder_id}` variable and parameter for subfolder support in `exp:file:entries` tag

Author: robinsowell

docs/add-ons/file.md

@@ -122,6 +122,12 @@ The file display engine sets some parameters dynamically, based on what is in th
 
 You can hard code the file entries tag to show specific files. You may also specify multiple files by separating them with the pipe character. This parameter takes precedence over any entry specified in the url.
 
+### `folder_id=`
+
+    folder_id="34"
+
+If you want to display only the files that are in certain folder within Upload Directory, specify folder ID using this parameter.
+
 ### `limit=`
 
     limit="30"
@@ -219,6 +225,10 @@ If you have defined any [image manipulations](control-panel/file-manager/upload-
 
 The URL to the file.
 
+### `{folder_id}`
+
+If the file is in a subfolder, will return ID of the folder. If the file is in root or upload directory, will return 0.
+
 ### `{height}`
 
 The height (in pixels) of the full-size image. (Empty for non-image files.)

docs/fieldtypes/file.md

@@ -132,6 +132,10 @@ If you have defined any [image manipulations](control-panel/file-manager/upload-
     {file_size:small:human}
     {file_size:small:human_long}
 
+### `{folder_id}`
+
+If the file is in a subfolder, will return ID of the folder. If the file is in root or upload directory, will return 0.
+
 ### `{height}`
 
 The height of the image (in pixels) if applicable.