[wp-cvs] wordpress/wp-admin upload.php,1.14.4.2,1.14.4.3

[Ernest MacDougal Campbell III]

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19297/wp-admin

Modified Files:
      Tag: WordPress-Ver-1_2-Branch
	upload.php 
Log Message:
Fixed file renaming bug that I introduced.

Index: upload.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/upload.php,v
retrieving revision 1.14.4.2
retrieving revision 1.14.4.3
diff -C2 -d -r1.14.4.2 -r1.14.4.3
*** upload.php	5 Oct 2004 22:39:07 -0000	1.14.4.2
--- upload.php	8 Oct 2004 14:57:23 -0000	1.14.4.3
***************
*** 77,93 ****
  break;
  case 'upload':
- ?>
  
! <?php //Makes sure they choose a file
  
! //print_r($HTTP_POST_FILES);
  //die();
  
  
!     $imgalt = (isset($_POST['imgalt'])) ? $_POST['imgalt'] : $imgalt;
! 
!     $img1_name = (strlen($imgalt)) ? $_POST['imgalt'] : $HTTP_POST_FILES['img1']['name'];
!     $img1_type = (strlen($imgalt)) ? $_POST['img1_type'] : $HTTP_POST_FILES['img1']['type'];
!     $imgdesc = str_replace('"', '&amp;quot;', $_POST['imgdesc']);
  
      $imgtype = explode(".",$img1_name);
--- 77,92 ----
  break;
  case 'upload':
  
! //Makes sure they choose a file
  
! //print_r($_FILES);
  //die();
  
  
!     $imgalt = basename( (isset($_POST['imgalt'])) ? $_POST['imgalt'] : '' );
!   
!     $img1_name = (strlen($imgalt)) ? $imgalt : basename( $_FILES['img1']['name'] );
!     $img1_type = (strlen($imgalt)) ? $_POST['img1_type'] : $_FILES['img1']['type'];
!     $imgdesc = htmlentities2($imgdesc);
  
      $imgtype = explode(".",$img1_name);
***************
*** 103,107 ****
      } else {
          $pathtofile = get_settings('fileupload_realpath')."/".$img1_name;
!         $img1 = $HTTP_POST_FILES['img1']['tmp_name'];
      }
  
--- 102,106 ----
      } else {
          $pathtofile = get_settings('fileupload_realpath')."/".$img1_name;
!         $img1 = $_FILES['img1']['tmp_name'];
      }
  
***************
*** 159,162 ****
--- 158,162 ----
  </div>
  <?php 
+ 
  require('admin-footer.php');
  die();
***************
*** 172,176 ****
          }
          // Still couldn't get it. Give up.
!         if (!moved) {
              die(sprintf(__("Couldn't upload your file to %s."), $pathtofile));
          } else {
--- 172,176 ----
          }
          // Still couldn't get it. Give up.
!         if (!$moved) {
              die(sprintf(__("Couldn't upload your file to %s."), $pathtofile));
          } else {
***************
*** 192,196 ****
          }
          elseif($_POST['thumbsize'] == 'custom') {
!             $max_side = $_POST['imgthumbsizecustom'];
          }
          
--- 192,196 ----
          }
          elseif($_POST['thumbsize'] == 'custom') {
!             $max_side = intval($_POST['imgthumbsizecustom']);
          }