[411] Final fix for achievements comparison

Shadez · Oct 24, 2010 · 246261c · 246261c
1 parent 8bcbeec
commit 246261c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/character-achievements.php b/character-achievements.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 397
+ * @revision 411
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -70,7 +70,6 @@
             $i++;
         }
     }
-    //
     $name = $comparisonData[0]['name'];
 }
 $realmId = $utils->GetRealmIdByName($_GET['r']);

diff --git a/includes/classes/class.characters.php b/includes/classes/class.characters.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 410
+ * @revision 411
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -743,20 +743,20 @@ public function GetHeader() {
             'gender'       => null,
             'genderId'     => $this->gender,
             'guildName'    => ($this->guild_id > 0) ? $this->guild_name : null,
-            'guildUrl'     => ($this->guild_id > 0) ? sprintf('r=%s&gn=%s', urlencode($this->armory->currentRealmInfo['name']), urlencode($this->guild_name)) : null,
+            'guildUrl'     => ($this->guild_id > 0) ? sprintf('r=%s&gn=%s', urlencode($this->GetRealmName()), urlencode($this->guild_name)) : null,
             'lastModified' => null,
             'level'        => $this->level,
             'name'         => $this->name,
             'points'       => $this->GetAchievementMgr()->GetAchievementPoints(),
             'prefix'       => $this->character_title['prefix'],
             'race'         => $this->raceText,
             'raceId'       => $this->race,
-            'realm'        => $this->armory->currentRealmInfo['name'],
+            'realm'        => $this->GetRealmName(),
             'suffix'       => $this->character_title['suffix'],
             'titleId'      => $this->character_title['titleId'],
         );
         if(Utils::IsWriteRaw()) {
-            $header['guildUrl'] = ($this->guild_id > 0) ? sprintf('r=%s&amp;gn=%s', urlencode($this->armory->currentRealmInfo['name']), urlencode($this->guild_name)) : null;
+            $header['guildUrl'] = ($this->guild_id > 0) ? sprintf('r=%s&amp;gn=%s', urlencode($this->GetRealmName()), urlencode($this->guild_name)) : null;
         }
         return $header;
     }
@@ -1094,8 +1094,6 @@ public function CalculateCharacterTalents() {
             }
         }
         $talent_data = array('points' => $talent_points);
-        //print_r($talent_data);
-        //die;
         return $talent_data;
     }
 
@@ -2610,12 +2608,12 @@ public function GetCharacterFeed($full = false) {
                     if($achievement_info['categoryId'] == 81) {
                         // Feats of strenght
                         $feed_data[$i]['title'] = sprintf('%s [%s].', $_strings[14], $achievement_info['title']);
-                        $feed_data[$i]['desc'] = sprintf('%s [<a class="achievement staticTip" href="character-achievements.xml?r=%s&amp;cn=%s" onMouseOver="setTipText(\'%s\')">%s</a>]', $_strings[14], urlencode($this->armory->currentRealmInfo['name']), urlencode($this->name), $tooltip, $achievement_info['title']);
+                        $feed_data[$i]['desc'] = sprintf('%s [<a class="achievement staticTip" href="character-achievements.xml?r=%s&amp;cn=%s" onMouseOver="setTipText(\'%s\')">%s</a>]', $_strings[14], urlencode($this->GetRealmName()), urlencode($this->name), $tooltip, $achievement_info['title']);
                     }
                     else {
                         $points_string = sprintf($_strings[18], $achievement_info['points']);
                         $feed_data[$i]['title'] = sprintf('%s [%s].', $_strings[13], $achievement_info['title']);
-                        $feed_data[$i]['desc'] = sprintf('%s [<a class="achievement staticTip" href="character-achievements.xml?r=%s&amp;cn=%s" onMouseOver="setTipText(\'%s\')">%s</a>] %s.', $_strings[13], urlencode($this->armory->currentRealmInfo['name']), urlencode($this->name), $tooltip, $achievement_info['title'], $points_string);
+                        $feed_data[$i]['desc'] = sprintf('%s [<a class="achievement staticTip" href="character-achievements.xml?r=%s&amp;cn=%s" onMouseOver="setTipText(\'%s\')">%s</a>] %s.', $_strings[13], urlencode($this->GetRealmName()), urlencode($this->name), $tooltip, $achievement_info['title'], $points_string);
                     }
                     $feed_data[$i]['tooltip'] = $tooltip;
                     break;

diff --git a/includes/revision_nr.php b/includes/revision_nr.php
@@ -1,5 +1,5 @@
 <?php
-define('ARMORY_REVISION', 410);
+define('ARMORY_REVISION', 411);
 define('DB_VERSION', 'armory_r398');
 define('CONFIG_VERSION', '0708201001');
 ?>