Permalink
Browse files

merge -c6705 from branch 2.1 to trunk

Feature 0001778: Thumbnails missing on NBM

Fix move_ccs_rules_to_body function

git-svn-id: http://piwigo.org/svn/trunk@6706 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information...
rub
rub committed Jul 24, 2010
1 parent 1448b42 commit 8ce85643a61e2c896204bc05b2097a375e07d0f3
Showing with 5 additions and 4 deletions.
  1. +5 −4 include/functions_mail.inc.php
@@ -760,22 +760,23 @@ function move_ccs_rules_to_body($content)
$selectors[$select][] = $style;
}
}
foreach ($selectors as $selector => $style)
{
if (!preg_match('/^(#|\.|)([A-Za-z0-9_-]*)$/', $selector, $matches))
{
$unknow_selectors .= $selector.' {'.implode('; ', $style).";}\n";
$unknow_selectors .= $selector.' {'.implode(";\n", $style).";}\n";
}
else switch ($matches[1])
{
case '#':
$content = preg_replace('|id="'.$matches[2].'"|', 'id="'.$matches[2].'" style="'.implode('; ', $style).';"', $content);
$content = preg_replace('|id="'.$matches[2].'"|', 'id="'.$matches[2].'" style="'.implode(";\n", $style).";\"\n", $content);
break;
case '.':
$content = preg_replace('|class="'.$matches[2].'"|', 'class="'.$matches[2].'" style="'.implode('; ', $style).';"', $content);
$content = preg_replace('|class="'.$matches[2].'"|', 'class="'.$matches[2].'" style="'.implode(";\n", $style).";\"\n", $content);
break;
default:
$content = preg_replace('#<'.$matches[2].'( |>)#', '<'.$matches[2].' style="'.implode('; ', $style).';"$1', $content);
$content = preg_replace('#<'.$matches[2].'( |>)#', '<'.$matches[2].' style="'.implode(";\n", $style).";\"\n$1", $content);
break;
}
}

0 comments on commit 8ce8564

Please sign in to comment.