Merge pull request #16 from damienalexandre/patch-1

oscarotero · oscarotero · commit f603bc2d2e6b · 2014-01-03T06:36:43.000-08:00
Fix wrong call to mb_convert_encoding in resolve()
diff --git a/Embed/Url.php b/Embed/Url.php
@@ -69,7 +69,7 @@ private function resolve () {
 			$charset = substr(strtoupper(strstr($charset, '=')), 1);
 
 			if (!empty($charset) && ($charset !== 'UTF-8')) {
-				@mb_convert_encoding($content, 'UTF-8', $charset);
+				$content = @mb_convert_encoding($content, 'UTF-8', $charset);
 			}
 		} else if (strpos($this->getResult('content_type'), '/') !== false) {
 			$this->result['mime_type'] = $this->getResult('content_type');

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ private function resolve () {`
`69`	`69`	`$charset = substr(strtoupper(strstr($charset, '=')), 1);`
`70`	`70`
`71`	`71`	`if (!empty($charset) && ($charset !== 'UTF-8')) {`
`72`		`- @mb_convert_encoding($content, 'UTF-8', $charset);`
	`72`	`+ $content = @mb_convert_encoding($content, 'UTF-8', $charset);`
`73`	`73`	`}`
`74`	`74`	`} else if (strpos($this->getResult('content_type'), '/') !== false) {`
`75`	`75`	`$this->result['mime_type'] = $this->getResult('content_type');`