Merge "Fixed some @params documentation (includes/*)"

diff --combined includes/resourceloader/ResourceLoaderStartUpModule.php
index 5ff88d8,dc32959..8dc5946
--- 1/includes/resourceloader/ResourceLoaderStartUpModule.php
--- 2/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@@ -120,7 -120,7 +120,7 @@@ class ResourceLoaderStartUpModule exten
        /**
         * Get registration code for all modules.
         *
-        * @param ResourceLoaderContext $context object
+        * @param ResourceLoaderContext $context
         * @return string JavaScript code for registering all modules with the client loader
         */
        public static function getModuleRegistrations( ResourceLoaderContext $context ) {
@@@ -238,7 -238,7 +238,7 @@@
        public static function getStartupModulesUrl( ResourceLoaderContext $context ) {
                // The core modules:
                $moduleNames = array( 'jquery', 'mediawiki' );
 -              wfRunHooks( 'ResourceLoaderGetStartupModules', array( &$moduleNames ) );
 +              wfRunHooks( 'ResourceLoaderGetStartupModules', array( &$moduleNames ), '1.23' );
  
                // Get the latest version
                $loader = $context->getResourceLoader();
@@@ -345,8 -345,8 +345,8 @@@
         *
         * Detect changes to mw.config settings embedded in #getScript (bug 28899).
         *
-        * @param $context ResourceLoaderContext
-        * @return string: Hash
+        * @param ResourceLoaderContext $context
+        * @return string Hash
         */
        public function getModifiedHash( ResourceLoaderContext $context ) {
                global $wgLegacyJavaScriptGlobals;

diff --combined includes/search/SearchPostgres.php
index e4f4b55,cb81aaa..2a20d70
--- 1/includes/search/SearchPostgres.php
--- 2/includes/search/SearchPostgres.php
+++ b/includes/search/SearchPostgres.php
@@@ -34,7 -34,7 +34,7 @@@ class SearchPostgres extends SearchData
         * Currently searches a page's current title (page.page_title) and
         * latest revision article text (pagecontent.old_text)
         *
-        * @param string $term raw search term
+        * @param string $term Raw search term
         * @return PostgresSearchResultSet
         */
        function searchTitle( $term ) {
@@@ -64,7 -64,7 +64,7 @@@
         * Transform the user's search string into a better form for tsearch2
         * Returns an SQL fragment consisting of quoted text to search for.
         *
-        * @param $term string
+        * @param string $term
         *
         * @return string
         */
@@@ -130,9 -130,9 +130,9 @@@
  
        /**
         * Construct the full SQL query to do the search.
-        * @param $term String
-        * @param $fulltext String
-        * @param $colname
+        * @param string $term
+        * @param string $fulltext
+        * @param string $colname
         * @return string
         */
        function searchQuery( $term, $fulltext, $colname ) {
@@@ -191,7 -191,7 +191,7 @@@
  
        function update( $pageid, $title, $text ) {
                ## We don't want to index older revisions
 -              $sql = "UPDATE pagecontent SET textvector = NULL WHERE old_id IN " .
 +              $sql = "UPDATE pagecontent SET textvector = NULL WHERE textvector IS NOT NULL and old_id IN " .
                                "(SELECT rev_text_id FROM revision WHERE rev_page = " . intval( $pageid ) .
                                " ORDER BY rev_text_id DESC OFFSET 1)";
                $this->db->query( $sql );