Merge branch '3.0'

# Conflicts:
#	wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Search.js

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Search.js
index 8936933d6e27a04f7d2c113f608a85214ebe3129,624560f3d1d3f1c50a0ed73689bbfeda864949c5..b347c0787577f4dbbafa9a1524e125ab77de9b97
--- 1/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Search.js
--- 2/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Search.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Search.js
@@@ -111,20 -96,18 +111,22 @@@ define(['Ajax', 'Core', 'Dom/Traverse'
                },
                
                /**
 -               * Sends an AJAX request to fetch search results.
 +               * Shows the search string threshold error.
                 */
 -              _search: function() {
 -                      this._searchMode = true;
 -                      
 -                      Ajax.api(this, {
 -                              parameters: {
 -                                      imagesOnly: this._mediaManager.getOption('imagesOnly'),
 -                                      mode: this._mediaManager.getMode(),
 -                                      searchString: this._input.value
 -                              }
 -                      });
 +              _showStringThresholdError: function() {
 +                      var innerInfo = DomTraverse.childByClass(this._input.parentNode.parentNode, 'innerInfo');
 +                      if (innerInfo) {
 +                              elShow(innerInfo);
 +                      }
 +                      else {
 +                              innerInfo = elCreate('p');
 +                              innerInfo.className = 'innerInfo';
-                               innerInfo.textContent = Language.get('wcf.media.search.info.searchStringThreshold');
++                              innerInfo.textContent = Language.get('wcf.media.search.info.searchStringThreshold', {
++                                      minSearchLength: this._mediaManager.getOption('minSearchLength')
++                              });
 +                              
 +                              DomUtil.insertAfter(innerInfo, this._input.parentNode);
 +                      }
                },
                
                /**

diff --cc wcfsetup/install/files/style/ui/media.scss
Simple merge

diff --cc wcfsetup/install/lang/de.xml
Simple merge

diff --cc wcfsetup/install/lang/en.xml
Simple merge