fix for empty tags being saved in page

This commit is contained in:
Andy Miller
2015-08-14 06:41:43 -06:00
parent 65cf04faed
commit 7c8b3363b9

View File

@@ -838,20 +838,12 @@ class AdminController
$obj->validate(); $obj->validate();
$obj->filter(); $obj->filter();
// $visible_after = $obj->visible();
// force reordering
// $reorder = true;
// rename folder based on visible // rename folder based on visible
if ($original_order == 1000) { if ($original_order == 1000) {
// increment order to force reshuffle // increment order to force reshuffle
$obj->order($original_order + 1); $obj->order($original_order + 1);
} }
// } elseif (!$visible_after && $obj->order()) {
// // needs to have order removed
// $obj->folder($obj->slug());
// }
} else { } else {
// Handle standard data types. // Handle standard data types.
@@ -1155,6 +1147,7 @@ class AdminController
$page->template($type); $page->template($type);
} }
// Special case for Expert mode: build the raw, unset content // Special case for Expert mode: build the raw, unset content
if (isset($input['frontmatter']) && isset($input['content'])) { if (isset($input['frontmatter']) && isset($input['content'])) {
$page->raw("---\n" . (string) $input['frontmatter'] . "\n---\n" . (string) $input['content']); $page->raw("---\n" . (string) $input['frontmatter'] . "\n---\n" . (string) $input['content']);
@@ -1166,11 +1159,17 @@ class AdminController
foreach($header as $key => $value) { foreach($header as $key => $value) {
if ($key == 'metadata') { if ($key == 'metadata') {
foreach($header['metadata'] as $key2 => $value2) { foreach ($header['metadata'] as $key2 => $value2) {
if (isset($input['toggleable_header']['metadata'][$key2]) && !$input['toggleable_header']['metadata'][$key2]) { if (isset($input['toggleable_header']['metadata'][$key2]) && !$input['toggleable_header']['metadata'][$key2]) {
$header['metadata'][$key2] = ''; $header['metadata'][$key2] = '';
} }
} }
} elseif ($key == 'taxonomy') {
foreach ($header[$key] as $taxkey => $taxonomy) {
if (is_array($taxonomy) && count($taxonomy) == 1 && $taxonomy[0] == '') {
unset($header[$key][$taxkey]);
}
}
} else { } else {
if (isset($input['toggleable_header'][$key]) && !$input['toggleable_header'][$key]) { if (isset($input['toggleable_header'][$key]) && !$input['toggleable_header'][$key]) {
$header[$key] = null; $header[$key] = null;