Changeset 22175

Timestamp:

Apr 12, 2013, 9:57:51 PM (11 years ago)

Author:

rvelices

Message:

fix quick search php warnings in some very rare cases

File:

• trunk/include/functions_search.inc.php (modified) (4 diffs)

trunk/include/functions_search.inc.php

@@ -373 +373 @@
   for ($i=0; $i<count($tokens); $i++)
   {
-    if (strstr($token_modifiers[$i], 'q')===false)
+    if ( !($token_modifiers[$i] & QST_QUOTED) )
     {
       if ( substr($tokens[$i], -1)=='*' )
       {
         $tokens[$i] = rtrim($tokens[$i], '*');
-        $token_modifiers[$i] .= '*';
+        $token_modifiers[$i] |= QST_WILDCARD_END;
       }
     }
@@ -550 +550 @@
         array_splice($token_tag_ids[$i], $j, 1);
         array_splice($token_tag_scores[$i], $j, 1);
+        $j--;
+        continue;
       }
 
@@ -561 +563 @@
     }
   }
-  
+
   usort($all_tags, 'tag_alpha_compare');
   foreach ( $all_tags as &$tag )
@@ -767 +769 @@
   $allowed_images = array_flip( $allowed_images );
   $divisor = 5.0 * count($allowed_images);
-  foreach ($allowed_images as $id=>$rank )
+  foreach ($allowed_images as $id=> &$rank )
   {
     $weight = isset($by_weights[$id]) ? $by_weights[$id] : 1;
     $weight -= $rank/$divisor;
-    $allowed_images[$id] = $weight;
-  }
+    $rank = $weight;
+  }
+  unset($rank);
+
   arsort($allowed_images, SORT_NUMERIC);
   $search_results['items'] = array_keys($allowed_images);