Merge remote-tracking branch 'origin/master'

2015-08-23 15:55:32 +02:00 · 2015-08-23 15:55:32 +02:00 · 79cb5f3c14
commit 79cb5f3c14
parent 92398a85aa 93d0534439
1 changed files with 1 additions and 1 deletions
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) {
 * @param boolean $show_error whether to display SQL error messages or not
 * @param int     $options    query options
 *
- * @return integer   the result set, or false if no result set
+ * @return resource|boolean the result set, or false if no result set
 *
 * @access  public
 *