mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-06-02 04:15:05 +02:00
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
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user