Merge "Don't bother showing prev/next links navigation when there's few results"

[lhc/web/wiklou.git] / includes / db / DatabasePostgres.php

diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 6aee528..131b758 100644 (file)
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -223,7 +223,7 @@ class SavepointPostgres {
 
        /**
         * @param DatabaseBase $dbw
-        * @param $id
+        * @param int $id
         */
        public function __construct( $dbw, $id ) {
                $this->dbw = $dbw;
@@ -831,7 +831,7 @@ __INDEXATTR__;
                $options = array(), $join_conds = array()
        ) {
                if ( is_array( $options ) ) {
-                       $forUpdateKey = array_search( 'FOR UPDATE', $options );
+                       $forUpdateKey = array_search( 'FOR UPDATE', $options, true );
                        if ( $forUpdateKey !== false && $join_conds ) {
                                unset( $options[$forUpdateKey] );
 
@@ -1263,7 +1263,7 @@ __INDEXATTR__;
         * Values may contain magic keywords like "$user"
         * @since 1.19
         *
-        * @param $search_path array list of schemas to be searched by default
+        * @param array $search_path List of schemas to be searched by default
         */
        function setSearchPath( $search_path ) {
                $this->query( "SET search_path = " . implode( ", ", $search_path ) );