[php-blog-cvs] serendipity serendipity_admin_image_selector.php,1.39,1.40

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10197

Modified Files:
	serendipity_admin_image_selector.php 
Log Message:
- Clean up serendipity_makeThumbnail() and don't insert image into database from it. Instead serendipity_insertImageInDatabase has to be called "manually" after an image is done being processed.
- serendipity_insertImageInDatabase() now requires far less arguments, as it can calculate them on its own
- Fix E_NOTICE for non-string array element when mime is application/pdf
- Let serendipity_getImageSize do mime calc, so we don't need to clutter the rest of the code with serendipity_guessMime

The latter might need a little tweaking


Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- serendipity_admin_image_selector.php	26 Jan 2005 16:03:27 -0000	1.39
+++ serendipity_admin_image_selector.php	9 Feb 2005 19:46:09 -0000	1.40
@@ -49,8 +49,8 @@
 
                 case 'add':
                     include S9Y_INCLUDE_PATH . 'include/admin/images.inc.php';
-                    if (isset($created_thumbnail) && is_array($created_thumbnail) && isset($created_thumbnail['image_id'])) {
-                        $serendipity['GET']['image'] = (int)$created_thumbnail['image_id'];
+                    if (isset($created_thumbnail) && is_array($created_thumbnail)) {
+                        $serendipity['GET']['image'] = (int)$image_id; // $image_id is passed from images.inc.php
 
                         if (!empty($serendipity['POST']['htmltarget'])) {
                             $serendipity['GET']['htmltarget'] = $serendipity['POST']['htmltarget'];