Fixes a problem in how aggressively getSummariesFromOffsets tries to look up pages corresponding to links, a=chris
Fixes a problem in how aggressively getSummariesFromOffsets tries to look up pages corresponding to links, a=chris
diff --git a/lib/url_parser.php b/lib/url_parser.php
index c22b9281a..a0236ac7c 100755
--- a/lib/url_parser.php
+++ b/lib/url_parser.php
@@ -620,6 +620,7 @@ class UrlParser
*/
static function canonicalLink($link, $site, $no_fragment = true)
{
+ $link = trim($link);
if(!self::isSchemeHttpOrHttps($link)) {return NULL;}
if(isset($link[0]) &&
$link[0] == "/" && isset($link[1]) && $link[1] == "/") {
diff --git a/models/phrase_model.php b/models/phrase_model.php
index be089e6a8..58c76978e 100755
--- a/models/phrase_model.php
+++ b/models/phrase_model.php
@@ -1380,16 +1380,16 @@ class PhraseModel extends ParallelModel
$lookups = array();
foreach($summaries as $hash_url => $summary) {
$lookup_url = false;
- if(isset($summaries[$hash_url][self::LOCATION])) {
+ if(isset($summaries[$hash_url][self::LOCATION]) &&
+ $summaries[$hash_url][self::LOCATION] != array()) {
$tmp_url = explode(" => ",
$summaries[$hash_url][self::DESCRIPTION]);
if(isset($tmp_url[1])) {
$lookup_url = trim($tmp_url[1]);
}
- } else if (isset($summaries[$hash_url][self::HASH])){
+ } else if(isset($summaries[$hash_url][self::HASH])){
$hash_parts = explode('|', $summaries[$hash_url][self::HASH]);
- if(isset($hash_parts[3]) && strncmp($hash_parts[3],
- "location%3A", 11) == 0) {
+ if(isset($hash_parts[3]) ) {
$lookup_url = $hash_parts[1];
}
}