Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-07-28 16:06:00 +02:00
commit 14feab0741

View File

@ -2145,12 +2145,12 @@ class PMA_DisplayResults
/**
* Get sort order link
*
* @param string $order_img the sort order image
* @param integer $col_index the index of the column
* @param string $direction the display direction
* @param array $fields_meta set of field properties
* @param string $order_url the url for sort
* @param string $multi_order_url the url for sort
* @param string $order_img the sort order image
* @param integer $col_index the index of the column
* @param string $direction the display direction
* @param array $fields_meta set of field properties
* @param string $order_url the url for sort
* @param string $multi_order_url the url for sort
*
* @return string the sort order link
*