diff --git a/import.php b/import.php index a0ffa91..9175ce7 100644 --- a/import.php +++ b/import.php @@ -1618,11 +1618,12 @@ public static function stripslashes_recursive($var, $level = 0) return $new_var; } - public static function copy_smileys($source, $dest) + public static function copy_smileys($source) { if (!is_dir($source) || !($dir = opendir($source))) return; + $dest = dirname(__FILE__) . '/assets/smileys'; while ($file = readdir($dir)) { if ($file == '.' || $file == '..') diff --git a/smf2_to_wedge.xml b/smf2_to_wedge.xml index 9ba98b7..c3653e5 100644 --- a/smf2_to_wedge.xml +++ b/smf2_to_wedge.xml @@ -602,13 +602,6 @@
- $request = $db->query("
- SELECT value
- FROM {$to_prefix}settings
- WHERE variable='smileys_dir';");
- list ($we_smileys_dir) = $db->fetch_row($request);
- $db->free_result($request);
-
$request = $db->query("
SELECT value
FROM {$from_prefix}settings
@@ -616,7 +609,7 @@
list ($smf_smileys_dir) = $db->fetch_row($request);
$db->free_result($request);
- helper::copy_smileys($smf_smileys_dir, $we_smileys_dir);
+ helper::copy_smileys($smf_smileys_dir);