# HG changeset patch
# User Dan
# Date 1242086005 14400
# Node ID 2db0975aa31a798254b8ec17a669bd5af4117d8b
# Parent  72b37471cce062b2f4a51c574329196a368402e9
Fixed a couple bugs with admin avatar settings and getConfig() return types

diff -r 72b37471cce0 -r 2db0975aa31a plugins/SpecialAdmin.php
--- a/plugins/SpecialAdmin.php	Mon May 11 19:51:36 2009 -0400
+++ b/plugins/SpecialAdmin.php	Mon May 11 19:53:25 2009 -0400
@@ -808,27 +808,27 @@
         </td>
         <td class="row1">
           <label>
-            <input type="checkbox" name="avatar_upload_file" <?php if ( getConfig('avatar_upload_file') == '1' || getConfig('avatar_upload_file') === false ) echo 'checked="checked" '; ?>/>
+            <input type="checkbox" name="avatar_upload_file" <?php if ( getConfig('avatar_upload_file', 1) == 1 ) echo 'checked="checked" '; ?>/>
             <?php echo $lang->get('acpgc_field_avatar_upload_file'); ?>
           </label>
           
           <br />
           
           <label>
-            <input type="checkbox" name="avatar_upload_http" <?php if ( getConfig('avatar_upload_http') == '1' || getConfig('avatar_upload_http') === false ) echo 'checked="checked" '; ?>/>
+            <input type="checkbox" name="avatar_upload_http" <?php if ( getConfig('avatar_upload_http', 1) == 1 ) echo 'checked="checked" '; ?>/>
             <?php echo $lang->get('acpgc_field_avatar_upload_http'); ?>
           </label>
           
           <br />
           
           <label>
-          <input type="checkbox" name="avatar_upload_gravatar" <?php if ( getConfig('avatar_upload_gravatar') == '1' || getConfig('avatar_upload_gravatar') === false ) echo 'checked="checked" '; ?>onclick="document.getElementById('acp_gravatar_rating').style.display = ( this.checked ) ? 'block' : 'none';" />
+          <input type="checkbox" name="avatar_upload_gravatar" <?php if ( getConfig('avatar_upload_gravatar', 1) == 1 ) echo 'checked="checked" '; ?>onclick="document.getElementById('acp_gravatar_rating').style.display = ( this.checked ) ? 'block' : 'none';" />
             <?php echo $lang->get('acpgc_field_avatar_upload_gravatar'); ?>
           </label>
           
           <br />
           
-          <fieldset id="acp_gravatar_rating" style="margin-top: 10px; <?php if ( getConfig('avatar_upload_gravatar') === '0' ) echo ' display: none;'; ?>">
+          <fieldset id="acp_gravatar_rating" style="margin-top: 10px; <?php if ( getConfig('avatar_upload_gravatar', 1) == 0 ) echo ' display: none;'; ?>">
           
             <?php /* The four ratings are g, pg, r, and x - loop through each and output a localized string and a radiobutton */ ?>
             <legend><?php echo $lang->get('acpgc_field_avatar_gravatar_rating'); ?></legend>
diff -r 72b37471cce0 -r 2db0975aa31a plugins/admin/UserManager.php
--- a/plugins/admin/UserManager.php	Mon May 11 19:51:36 2009 -0400
+++ b/plugins/admin/UserManager.php	Mon May 11 19:53:25 2009 -0400
@@ -199,7 +199,7 @@
             if ( $action == 'set_http' )
             {
               // Check if this action is enabled
-              if ( getConfig('avatar_upload_http') !== '1' )
+              if ( getConfig('avatar_upload_http', 1) !== 1 )
               {
                 // non-localized, only appears on hack attempt
                 $errors[] = 'Uploads over HTTP are disabled.';
@@ -239,7 +239,7 @@
             else
             {
               // Check if this action is enabled
-              if ( getConfig('avatar_upload_file') !== '1' )
+              if ( getConfig('avatar_upload_file', 1) !== 1 )
               {
                 // non-localized, only appears on hack attempt
                 $errors[] = 'Uploads from the browser are disabled.';