! Importer failed for SMF2 because the smiley folder was no longer st…

…ored in the database. (import.php, smf2_to_wedge.xml)

Signed-off-by: Nao <nao@wedge>

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 == '..')

smf2_to_wedge.xml

@@ -602,21 +602,14 @@
 		<title>Copying smileys</title>
 		<detect>{$from_prefix}smileys</detect>
 		<code>
-			$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
 				WHERE variable='smileys_dir';");
 			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);
 		</code>
 	</step>