--- a/branches/2.5.4/cgi-bin/yabb2/Sources/Profile.pm
+++ b/branches/2.5.4/cgi-bin/yabb2/Sources/Profile.pm
@@ -1,6 +1,6 @@
 ###############################################################################
 # Profile.pm                                                                  #
-# $Date: 2013-07-12 15:37:58 +0000 (Fri, 12 Jul 2013) $
+# $Date: 2013-07-12 15:49:28 +0000 (Fri, 12 Jul 2013) $
 ###############################################################################
 # YaBB: Yet another Bulletin Board                                            #
 # Open-Source Community Software for Webmasters                               #
@@ -18,7 +18,7 @@
 use CGI::Carp qw(fatalsToBrowser);
 our $VERSION = '2.5.4';
 
-$profilepmver = 'YaBB 2.5.4 $Revision: 1087 $';
+$profilepmver = 'YaBB 2.5.4 $Revision: 1088 $';
 if ( $action eq 'detailedversion' ) { return 1; }
 
 LoadLanguage('Profile');
@@ -100,7 +100,7 @@
 
     $yynavigation = qq~› $profile_txt{'900'}~;
     $yytitle      = $profile_txt{'900'};
-    $yyjsstyle = 1;    
+    #$yyjsstyle = 1;    
     template();
     return;
 }
@@ -453,7 +453,7 @@
 
     if ( !$view ) {
         $yymain .= $showProfile;
-        $yyjsstyle = 1;    
+        #$yyjsstyle = 1;    
         template();
     }
     return;
@@ -580,7 +580,7 @@
 
     if ( !$view ) {
         $yymain .= $showProfile;
-        $yyjsstyle = 1;    
+        #$yyjsstyle = 1;    
         template();
     }
     return;
@@ -694,7 +694,7 @@
         $my_show_avatar = $myprofile_show_avatar_a;
         $my_show_avatar =~ s/{yabb my_up_avatar_a}/$my_up_avatar_a/sm;
         $my_show_avatar =~ s/{yabb my_up_avatar_b}/$my_up_avatar_b/sm;
-        $my_show_avatar =~ s/{yabb av_pic}/$pic/gsm;
+        $my_show_avatar =~ s/{yabb av_pic}/$pic/sm;
         $my_show_avatar =~ s/{yabb av_alt}/$alt/sm;
         $my_show_avatar =~ s/{yabb av_s}/$s/gsm;
         $my_show_avatar =~ s/{yabb av_tmp}/$tmp/sm;
@@ -989,7 +989,7 @@
 
     if ( !$view ) {
         $yymain .= $showProfile;
-        $yyjsstyle = 1;    
+        #$yyjsstyle = 1;    
         template();
     }
     return;
@@ -1067,7 +1067,7 @@
 
     if ( !$view ) {
         $yymain .= $showProfile;
-        $yyjsstyle = 1;    
+        #$yyjsstyle = 1;    
         template();
     }
     return;
@@ -1182,7 +1182,7 @@
 
     if ( !$view ) {
         $yymain .= $showProfile;
-        $yyjsstyle = 1;    
+        #$yyjsstyle = 1;    
         template();
     }
     return;
@@ -1428,7 +1428,7 @@
 
     if ( !$view ) {
         $yymain .= $showProfile;
-        $yyjsstyle = 1;    
+        #$yyjsstyle = 1;    
         template();
     }
     return;
@@ -2027,7 +2027,7 @@
         $shared_login      = sharedLogin();
         $yymain .= $shared_login;
         $yytitle = $profile_txt{'245'};
-        $yyjsstyle = 1;    
+        #$yyjsstyle = 1;    
         template();
     }
 
@@ -2841,7 +2841,7 @@
                         </div>
                         <div class="contactright">
                         <img src="$imagesdir/$my_gtalk" alt="" />
-                        <a href="#" onclick="window.open('$scripturl?action=setgtalk;gtalkname=$user','','height=80,width=340,menubar=no,toolbar=no,scrollbars=no'); return false">$profile_txt{'825'} ${$uid.$user}{'realname'}</a>
+                        <a href="#" onclick="window.open('$scripturl?action=setgtalk;gtalkname=$user','','height=80,width=340,menubar=0,toolbar=0,scrollbars=0,resizable=1'); return false">$profile_txt{'825'} ${$uid.$user}{'realname'}</a>
                         </div>~;
     }
     if ( ${ $uid . $user }{'skype'} ) {
@@ -3684,7 +3684,7 @@
     if ( !$view ) {
         $yynavigation = qq~&rsaquo; $maintxt{'213'}~;
         $yymain .= $showProfile;
-        $yyjsstyle = 1;    
+        #$yyjsstyle = 1;    
         template();
     }
     return;