Skip to content

Commit

Permalink
[487] Revert prev. commit
Browse files Browse the repository at this point in the history
  • Loading branch information
Shadez committed Mar 7, 2011
1 parent 299329e commit 7b25de3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions includes/classes/class.items.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* @package World of Warcraft Armory
* @version Release 4.50
* @revision 486
* @revision 487
* @copyright (c) 2009-2011 Shadez
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
Expand Down Expand Up @@ -1289,9 +1289,9 @@ public function GetItemData($itemID) {
Armory::$wDB->SkipNextError();
$itemData = Armory::$wDB->selectRow("SELECT `name`, `Quality`, `ItemLevel`, `displayid`, `SellPrice`, `BuyPrice`, `Flags2`, `RequiredDisenchantSkill` FROM `item_template` WHERE `entry`=%d LIMIT 1", $itemID);
if(!$itemData) {
$itemData = Armory::$wDB->selectRow("SELECT `name`, `Quality`, `ItemLevel`, `displayid`, `SellPrice`, `BuyPrice`, `ExtraFlags`, `RequiredDisenchantSkill` FROM `item_template` WHERE `entry`=%d LIMIT 1", $itemID);
$itemData['Flags2'] = $itemData['ExtraFlags']; // For compatibility
unset($itemData['ExtraFlags']);
$itemData = Armory::$wDB->selectRow("SELECT `name`, `Quality`, `ItemLevel`, `displayid`, `SellPrice`, `BuyPrice`, `FlagsExtra`, `RequiredDisenchantSkill` FROM `item_template` WHERE `entry`=%d LIMIT 1", $itemID);
$itemData['Flags2'] = $itemData['FlagsExtra']; // For compatibility
unset($itemData['FlagsExtra']);
}
return $itemData;
}
Expand Down
2 changes: 1 addition & 1 deletion includes/revision_nr.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
define('ARMORY_REVISION', 486);
define('ARMORY_REVISION', 487);
define('DB_VERSION', 'armory_r471');
define('CONFIG_VERSION', '2001201101');
?>

0 comments on commit 7b25de3

Please sign in to comment.