Changeset 13149

Timestamp:

Nov 16, 2009, 8:30:31 PM (13 years ago)

Author:

ogawa

Message:

#3176:一時画像DBからの保存時に二重エンコードされていた問題を修正

Location:

OpenPNE/branches/stable-2.12.x/webapp/lib

Files:

• db/image.php (modified) (1 diff)
• util/image.php (modified) (1 diff)

OpenPNE/branches/stable-2.12.x/webapp/lib/db/image.php

@@ -58 +58 @@
 /*** write ***/
 
-function db_image_insert_c_image($filename, $bin, $type = '')
+function db_image_insert_c_image($filename, $bin, $type = '', $is_encoded = false)
 {
     $db =& db_get_instance('image');
 
+    if (!$is_encoded) {
+        $bin = base64_encode($bin);
+    }
+
     $data = array(
         'filename'   => $filename,
-        'bin'        => base64_encode($bin),
+        'bin'        => $bin,
         'type'       => $type,
         'r_datetime' => db_now(),

OpenPNE/branches/stable-2.12.x/webapp/lib/util/image.php

@@ -263 +263 @@
         $c_tmp_image = db_image_c_tmp_image4filename($tmpfile);
 
-        if (db_image_insert_c_image($filename, $c_tmp_image['bin'])) {
+        if (db_image_insert_c_image($filename, $c_tmp_image['bin'], '', true)) {
             return $filename;
         }