Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1977
Modified Files:
serendipity_functions_images.inc.php
Log Message:
Two little tidbits
1. CaSe CoNfLiCt
_guessMime vs. _guessMIME
2. replaced preg_match with an equivalent strpos
Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_functions_images.inc.php 8 Jun 2004 14:49:27 -0000 1.13
+++ serendipity_functions_images.inc.php 6 Jul 2004 21:15:12 -0000 1.14
@@ -266,7 +266,7 @@
$serendipity['imageList'] = serendipity_fetchImagesFromDatabase(0, 0, $total);
foreach ($serendipity['imageList'] as $k => $file) {
- $is_image = (preg_match('@^image/@i', $file['mime']) ? true : false);
+ $is_image = ( 0 === strpos(strtolower($file['mime']), "image/") );
if ($is_image) {
$update = false;
@@ -314,7 +314,7 @@
return $i;
}
-function serendipity_guessMIME($extension) {
+function serendipity_guessMime($extension) {
$mime = '';
switch (strtolower($extension)) {
case 'pdf':
@@ -671,7 +671,7 @@
++$x; $preview = '';
$i = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension']);
$imgsrc = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
- $is_image = (preg_match('@^image/@i', $file['mime']) ? true : false);
+ $is_image = ( 0 === strpos(strtolower($file['mime']), "image/") );
if (file_exists($imgsrc)) {
$preview .= '<img src="' . $imgsrc . '" border="0" alt="'. $file['name'] . '" />';
|
