[461] Fix for [458] fix.

Shadez · Jan 19, 2011 · b0ba223 · b0ba223
1 parent 3746c1d
commit b0ba223
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
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 4.50
- * @revision 459
+ * @revision 461
  * @copyright (c) 2009-2011 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -2704,13 +2704,15 @@ public function GetCharacterFeed($full = false) {
                     // Get criterias
                     $achievement_ids = array();
                     $dungeonDifficulty = $event['difficulty'];
-                    if($dungeonDifficulty == -1) {
-                        $dungeonDifficulty = 0;
+                    if($dungeonDifficulty <= 0) {
+                        $DifficultyEntry = $event_data;
                     }
-                    // Search for difficulty_entry_X
-                    $DifficultyEntry = Armory::$wDB->selectCell("SELECT `entry` FROM `creature_template` WHERE `difficulty_entry_%d` = %d", $event['difficulty'], $event_data);
-                    if(!$DifficultyEntry || $DifficultyEntry == 0) {
-                        $DifficultyEntry = $event['data'];
+                    else {
+                        // Search for difficulty_entry_X
+                        $DifficultyEntry = Armory::$wDB->selectCell("SELECT `entry` FROM `creature_template` WHERE `difficulty_entry_%d` = %d", $event['difficulty'], $event_data);
+                        if(!$DifficultyEntry || $DifficultyEntry == 0) {
+                            $DifficultyEntry = $event['data'];
+                        }
                     }
                     $criterias = Armory::$aDB->select("SELECT `referredAchievement` FROM `ARMORYDBPREFIX_achievement_criteria` WHERE `data` = %d", $DifficultyEntry);
                     if(!$criterias || !is_array($criterias)) {

diff --git a/includes/revision_nr.php b/includes/revision_nr.php
@@ -1,5 +1,5 @@
 <?php
-define('ARMORY_REVISION', 460);
+define('ARMORY_REVISION', 461);
 define('DB_VERSION', 'armory_r456');
 define('CONFIG_VERSION', '1801201101');
 ?>