[97] Small fixes

Shadez · Feb 28, 2010 · 9186bf3 · 9186bf3
1 parent 20b5130
commit 9186bf3
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 10 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 65
+ * @revision 97
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -39,6 +39,9 @@
 elseif(isset($_GET['cn'])) {
     $charname = $_GET['cn'];
 }
+else {
+    $charname = false;
+}
 $characters->name = Utils::escape($charname);
 // Check
 if(!$characters->IsCharacter()) {

diff --git a/character-reputation.php b/character-reputation.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 65
+ * @revision 97
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -39,6 +39,9 @@
 elseif(isset($_GET['cn'])) {
     $charname = $_GET['cn'];
 }
+else {
+    $charname = false;
+}
 $characters->name = Utils::escape($charname);
 // Check
 if(!$characters->IsCharacter()) {

diff --git a/character-sheet.php b/character-sheet.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 95
+ * @revision 97
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -41,6 +41,9 @@
 elseif(isset($_GET['cn'])) {
     $charname = $_GET['cn'];
 }
+else {
+    $charname = false;
+}
 $characters->name = Utils::escape($charname);
 // Check
 if(!$characters->IsCharacter()) {

diff --git a/character-talents.php b/character-talents.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 65
+ * @revision 97
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -39,6 +39,9 @@
 elseif(isset($_GET['cn'])) {
     $charname = $_GET['cn'];
 }
+else {
+    $charname = false;
+}
 $characters->name = Utils::escape($charname);
 // Check
 if(!$characters->IsCharacter()) {

diff --git a/includes/classes/class.items.php b/includes/classes/class.items.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 95
+ * @revision 97
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -488,7 +488,7 @@ public function BuildLootTable($item, $vendor, $data=false) {
                 if(!empty($CraftLoot)) {
                     $i=0;
                     foreach($CraftLoot as $craftItem) {
-                        $lootTable[$i]['name'] = $craftItem['SpellName_'.$locale];
+                        $lootTable[$i]['name'] = $craftItem['SpellName_'.$this->_locale];
                         for($o=1;$o<9;$o++) {
                             if($craftItem['Reagent_'.$o] > 0) {
                                 $lootTable[$i]['entry_reagent_'.$o] = $craftItem['Reagent_'.$o];

diff --git a/includes/locales/en_gb.conf b/includes/locales/en_gb.conf
@@ -3,7 +3,7 @@
 # Author: Shadez
 # Locale: English (en_GB)
 # Package: World of Warcraft Armory
-# File revision: 94
+# File revision: 97
 # Status: Release Candidate 1
 
 # global strings
@@ -97,7 +97,7 @@ equip_slot_19 = Tabard
 equip_slot_20 = Chest
 equip_slot_21 = Right hand
 equip_slot_22 = Left hand
-equip_slot_23 = Gun
+equip_slot_23 = Held In Off Hand
 equip_slot_24 = Колчан
 equip_slot_25 = Relic
 

diff --git a/includes/locales/ru_ru.conf b/includes/locales/ru_ru.conf
@@ -3,7 +3,7 @@
 # Author: Shadez
 # Locale: Russian (ru_RU)
 # Package: World of Warcraft Armory
-# File revision: 94
+# File revision: 97
 # Status: Release Candidate 1
 
 # global strings
@@ -97,7 +97,7 @@ equip_slot_19 = Накидка
 equip_slot_20 = Грудь
 equip_slot_21 = Правая рука
 equip_slot_22 = Левая рука
-equip_slot_23 = Огнестрельное
+equip_slot_23 = Держится в левой руке
 equip_slot_24 = Колчан
 equip_slot_25 = Реликвия