首页 发现 帮助
登录
githab
/
cakephp-tools
2
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

fix css

euromark 12 年之前
父节点
b70980798d
当前提交
3769ff3e21
共有 3 个文件被更改，包括 5 次插入 和 3 次删除
合并视图 显示文件统计
  1. 1 1
      Lib/InlineCssLib.php
  2. 1 1
      Lib/Utility/FileLib.php
  3. 3 1
      Vendor/CssToInlineStyles/CssToInlineStyles.php

+ 1 - 1
Lib/InlineCssLib.php
查看文件 

@@ -75,7 +75,7 @@ class InlineCssLib {
 
 
 
 		//fix issue with <html> being added
 
 		//fix issue with <html> being added
 
 		$separator = '~~~~~~~~~~~~~~~~~~~~';
 
 		$separator = '~~~~~~~~~~~~~~~~~~~~';
 
-		if (strpos($html, '<html>') === false) {
 
+		if (strpos($html, '<html') === false) {
 
 			$incomplete = true;
 
 			$incomplete = true;
 
 			$html = $separator . $html . $separator;
 
 			$html = $separator . $html . $separator;
 
 		}
 
 		}

+ 1 - 1
Lib/Utility/FileLib.php
查看文件 

@@ -133,7 +133,7 @@ class FileLib extends File {
 
 		}
 
 		}
 
 		$success = true;
 
 		$success = true;
 
 		foreach ($data as $row) {
 
 		foreach ($data as $row) {
 
-			if (fputcsv($this->handle, array_values($row), (isset($delimiter) ? $delimiter : ','), (isset($enclosure) ? $enclosure : '"')) === false) {
 
+			if (fputcsv($this->handle, array_values((array)$row), (isset($delimiter) ? $delimiter : ','), (isset($enclosure) ? $enclosure : '"')) === false) {
 
 				$success = false;
 
 				$success = false;
 
 			}
 
 			}
 
 		}
 
 		}

+ 3 - 1
Vendor/CssToInlineStyles/CssToInlineStyles.php
查看文件 

@@ -464,7 +464,9 @@ class CssToInlineStyles
 
             // Only for >PHP5.4
 
             // Only for >PHP5.4
 
             // Correct scrambled UTF8 chars (&atilde;&#131;...) back to their correct representation.
 
             // Correct scrambled UTF8 chars (&atilde;&#131;...) back to their correct representation.
 
             $html = html_entity_decode($html, ENT_XHTML, 'UTF-8');
 
             $html = html_entity_decode($html, ENT_XHTML, 'UTF-8');
 
-            $html = utf8_decode($html);
 
+            if (DS === '\\') {
 
+            	$html = utf8_decode($html);
 
+            }
 
         }
 
         }
 
 
 
         // cleanup the HTML if we need to
 
         // cleanup the HTML if we need to