Merge remote-tracking branch 'upstream/staging' into staging

administrator/components/com_finder/helpers/indexer/indexer.php

@@ -424,7 +424,7 @@ protected function tokenizeToDb($input, $context, $lang, $format)
 						$string = substr($buffer, 0, $ls);
 
 						// Adjust the buffer based on the last space for the next iteration and trim.
-						$buffer = JString::trim(substr($buffer, $ls));
+						$buffer = StringHelper::trim(substr($buffer, $ls));
 					}
 					// No space character was found.
 					else