Changeset 1107:3943962d69b8 for plugins/importExport

Timestamp:

02/27/13 11:48:32 (12 years ago)

Author:

JcDenis

Branch:

sexy

Parents:

880:02c78f56f430 (diff), 1105:ce855d61f9ce (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with default branch in 2.5-RC

Files:

• plugins/importExport/inc/flat/class.flat.import.php (modified) (1 diff)
• plugins/importExport/inc/flat/class.flat.import.php (modified) (2 diffs)

plugins/importExport/inc/flat/class.flat.import.php

@@ -787 +787 @@
           $strReq = 'SELECT media_id '.
                     'FROM '.$this->prefix.'media '.
-                    "WHERE media_path = '".$this->cur_media->media_path."' ".
-                    "AND media_file = '".$this->cur_media->media_file."' ";
+                    "WHERE media_path = '".$this->con->escape($this->cur_media->media_path)."' ".
+                    "AND media_file = '".$this->con->escape($this->cur_media->media_file)."' ";
           
           $rs = $this->con->select($strReq);

plugins/importExport/inc/flat/class.flat.import.php

@@ -440 +440 @@
           }
           
-          $post_password = $post->post_password ? (string) $post->post_password : null;
-          
           $this->cur_post->post_id            = (integer) $post->post_id;
           $this->cur_post->blog_id            = (string) $post->blog_id;
@@ -449 +447 @@
           $this->cur_post->post_creadt        = (string) $post->post_creadt;
           $this->cur_post->post_upddt         = (string) $post->post_upddt;
-          $this->cur_post->post_password      = $post_password;
           $this->cur_post->post_type          = (string) $post->post_type;
           $this->cur_post->post_format        = (string) $post->post_format;