better fix than the last one

brookinsconsulting · Jan 3, 2012 · 596ed4a · 596ed4a
1 parent 803167e
commit 596ed4a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/classes/sitelink.class.php b/classes/sitelink.class.php
@@ -301,9 +301,6 @@ static function hostMatchMapItems($object=false){
  if(!array_key_exists($HostItemArray[1],$HostMatchMapItems) || ($object && $object->currentHost==$HostItemArray[0] && $object->siteAccess['name']==$HostItemArray[1])){
  $HostMatchMapItems[$HostItemArray[1]] = ($SiteAccess && array_key_exists($HostItemArray[1],$SiteAccess)) ? $SiteAccess[$HostItemArray[1]] : $HostItemArray[0];
  }
- if($object->siteAccess && $HostItemArray[1]==$object->siteAccess['name']){
- $HostMatchMapItems[$HostItemArray[1]] = $HostItemArray[0];
- }
  }
  }
  return $HostMatchMapItems;

diff --git a/operators/sitelinkoperator.php b/operators/sitelinkoperator.php
@@ -121,6 +121,11 @@ static function sitelink(&$operatorValue, &$namedParameters){
  $Matchup=0;
  foreach($Match as $UseMatchItem){
  if($UseMatchItem['locale']==$SiteLink->currentLocale){
+ if ($SiteLink->siteAccess['name'] == $UseMatchItem['siteaccess']) {
+ $UseMatchItem['host'] = '';
+ $UseMatch = $UseMatchItem;
+ break;
+ }
  if(($CheckMatch=similar_text($SiteLink->currentHost, $UseMatchItem['host'])) > $Matchup){
  $Matchup = $CheckMatch;
  $UseMatch = $UseMatchItem;