From 800ccefd2e95a2907985bf79cd2e9b2eb74a3666 Mon Sep 17 00:00:00 2001
From: Shadez <d.master.me@gmail.com>
Date: Wed, 7 Jul 2010 12:45:08 +0900
Subject: [PATCH] [295] Rename Characters::extractCharacterProfessions() to
 Characters::GetCharacterProfessions()

---
 character-sheet.php                   |   6 +++---
 images/icons/professions/none-sm.gif  | Bin 0 -> 879 bytes
 includes/armory_loader.php            |   3 ++-
 includes/classes/class.characters.php |   4 ++--
 includes/revision_nr.php              |   2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 images/icons/professions/none-sm.gif

diff --git a/character-sheet.php b/character-sheet.php
index ada0c8723..4a92ab3b6 100644
--- 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
new file mode 100644
index 0000000000000000000000000000000000000000..cda291635e4873dc2d4745eb3f6b02a627fd91ee
GIT binary patch
literal 879
zcmV-#1CabjNk%w1VH*G&0Oo%Hws`>4Dh0PA0L_vHSULk40s#L*1S&KutcVwtCkugE
z2Xq$$M<M`L0sv_}0VM$d%PItO0swVL07Vl37!(Hq003ww0C-dYO9B9r2n0qo3_dIZ
zlpFw75&$#-0BQ;Vq8<V^76AWZ9ZU-Vf(!th9RM^701E*CT`mAU3;@L`07L=+IsyO?
z2>~c37&bN^CnO3pEFeKVCVF-?7#<N>RXj#W3rtHcU04pIr&B^iCN41wf`UkDWi4lA
z5NKgXPf$HqO&)@V7F}adR!d7qNji=g0RQ=((H;N}4Io)uTH+!A?6wX6SssTO0D~L}
zh!Fw#k4N}P5~W}P;CMR!KLYH?ME}!I(3~l{pgkxY0>X>{!;2dK?Tz{Li>QDM|J_)}
zsx#6t1E_8hL`g?aM^);q2><hV@3$ZHBmj9j0Cs{bq9OqFRv7<M6PlKR`A{9~;Z~1G
z1O3rZkrM!#5dgc10LMlc+d>z|zG=rM0Qvc||No%>|EPc$2><{8A^8LW004ggEC2ui
z02=@s000O7fPaF6gEBQWH#a&jgpH1aKQl8vJ~%c(K|e*0k1s+(I4~8XqcAZyLkFCL
zNjV1<1rG(JumvYDI;xy5YoiZO9~dX2Cv<)b1r#zdoH{n67;tzEv!f(YR1GIGGLJIP
z6(=lpO(4S+4{ag=4G$GJ%#AxcTBI0DQXb)VZV?$6CRz|-L<j~27X%oz2uDH;ga-*k
zKq=6`1cMC}h`1p1!k_{*3M*h(AO(aJ741@lkf4A9j(CDz(9n<t015&XSga6GML+`&
zCr~)pf?xxVje}%v$a4n36bBC)lrX@-g9ix!1~3V;p$F2KFj{=s1IEl478oF?2(V(p
zfH_^vydY>X1LmI?F)Cb$)8~qu5hVnS&;w!u7d}U<;N(GrkP8<tHrPQk#X^Sw7%GrR
z)4>83G#5_9=+W3QkO~AGFqpsw$tVv{IE+X^Ktqchb_Kc6QK7|&79CX7A;qGE5f-F!
zP<RC6G&(j;B8)1q;)CE(JZf;FP=ibb6C5763-@5ef)N#z<fyQU!iym%+*LbqqJS+P
zKiIGOLj%T+8%5AkK^bq<5W{l&4MKr`HuNBg4>q`fV1kW2_5wE@QK;dD9Cqm8hZ_b0
F06Rp@D+K@m

literal 0
HcmV?d00001

diff --git a/includes/armory_loader.php b/includes/armory_loader.php
index 1f60e9bec..1ca3b9339 100644
--- 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
index ce71c669e..21e3d555f 100644
--- 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
index 4d381d63f..5d11aeb96 100644
--- 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');
 
 ?>
\ No newline at end of file