[295] Rename Characters::extractCharacterProfessions() to Characters:…

…:GetCharacterProfessions()
Shadez · Jul 7, 2010 · 800ccef · 800ccef
1 parent cef1988
commit 800ccef
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/character-sheet.php b/character-sheet.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 257
+ * @revision 295
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -79,7 +79,7 @@
 if(!$isCharacter) {
     $xml->XMLWriter()->startElement('characterInfo');
     $xml->XMLWriter()->writeAttribute('errCode', 'noCharacter');
-    $xml->XMLWriter()->endElement(); // characterInfo
+    $xml->XMLWriter()->endElement();  //characterInfo
     $xml->XMLWriter()->endElement(); //page
     $xml_cache_data = $xml->StopXML();
     echo $xml_cache_data;
@@ -170,7 +170,7 @@
 $xml->XMLWriter()->endElement();  //talentSpecs
 /* Character professions */
 $xml->XMLWriter()->startElement('professions');
-$character_professions = $characters->extractCharacterProfessions();
+$character_professions = $characters->GetCharacterProfessions();
 if($character_professions) {
     foreach($character_professions as $char_professions) {
         $xml->XMLWriter()->startElement('skill');

diff --git a/images/icons/professions/none-sm.gif b/images/icons/professions/none-sm.gif
diff --git a/includes/armory_loader.php b/includes/armory_loader.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 292
+ * @revision 295
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -96,6 +96,7 @@
             $_SESSION['armoryLocale'] = 'en_gb';
             break;
         case 'es_es':
+        case 'es_mx':
         case 'eses':
         case 'es':
             $_SESSION['armoryLocale'] = 'es_es';

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 277
+ * @revision 295
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -1192,7 +1192,7 @@ public function ReturnTalentTreeIcon($tree) {
      * @access   public
      * @return   array
      **/
-    public function extractCharacterProfessions() {
+    public function GetCharacterProfessions() {
         $skills_professions = array(164, 165, 171, 182, 186, 197, 202, 333, 393, 755, 773);
         $professions = $this->db->select("SELECT * FROM `character_skills` WHERE `skill` IN (?a) AND `guid`=? LIMIT 2", $skills_professions, $this->guid);
         if(!$professions) {

diff --git a/includes/revision_nr.php b/includes/revision_nr.php
@@ -1,6 +1,6 @@
 <?php
 
-define('ARMORY_REVISION', 294);
+define('ARMORY_REVISION', 295);
 define('DB_VERSION', 'armory_r289');
 
 ?>