From cbe26ad6152c998c9a3290b0d321030c61dc7f1b Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sat, 4 Jun 2011 19:12:06 +0300
Subject: media version saving fix

---
 inc/pageutils.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'inc/pageutils.php')

diff --git a/inc/pageutils.php b/inc/pageutils.php
index 51567191e..37b15a498 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -295,8 +295,6 @@ function wikiLockFN($id) {
 /**
  * returns the full path to the meta file specified by ID and extension
  *
- * The filename is URL encoded to protect Unicode chars
- *
  * @author Steven Danz <steven-danz@kc.rr.com>
  */
 function metaFN($id,$ext){
@@ -310,7 +308,7 @@ function metaFN($id,$ext){
 /**
  * returns the full path to the media's meta file specified by ID and extension
  *
- * The filename is URL encoded to protect Unicode chars
+ * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function mediaMetaFN($id,$ext){
     global $conf;
@@ -339,6 +337,7 @@ function metaFiles($id){
  * The filename is URL encoded to protect Unicode chars
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function mediaFN($id, $rev=''){
     global $conf;
@@ -347,8 +346,9 @@ function mediaFN($id, $rev=''){
     if(empty($rev)){
         $fn = $conf['mediadir'].'/'.utf8_encodeFN($id);
     }else{
-    	list($name, $ext) = explode(".", $id);
-        $fn = $conf['mediaolddir'].'/'.utf8_encodeFN($name).'.'.$rev.'.'.utf8_encodeFN($ext);
+    	$ext = mimetype($id);
+    	$name = substr($id, 0, strrpos($id, '.'));
+        $fn = $conf['mediaolddir'].'/'.utf8_encodeFN($name).'.'.(int)$rev.'.'.utf8_encodeFN($ext[0]);
     }
     return $fn;
 }
-- 
cgit v1.2.3