aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2011-07-07 09:13:03 +0000
committerpatdenice <patdenice@piwigo.org>2011-07-07 09:13:03 +0000
commitafdbb1a191d5f4541607796e242a0147a312d5c9 (patch)
tree1df14627fe9ad76a3ee057c3c7e3f229a84ea178
parentd0a3a9d7561889aab754e795a8d5ba787364bb0b (diff)
merge r11653 from branch 2.2 to trunk
No warning with new empty tpl file git-svn-id: http://piwigo.org/svn/trunk@11654 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--plugins/LocalFilesEditor/include/tpl.inc.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/LocalFilesEditor/include/tpl.inc.php b/plugins/LocalFilesEditor/include/tpl.inc.php
index aea29ed9d..1063b2238 100644
--- a/plugins/LocalFilesEditor/include/tpl.inc.php
+++ b/plugins/LocalFilesEditor/include/tpl.inc.php
@@ -14,7 +14,7 @@ if ((isset($_POST['edit'])) and !is_numeric($_POST['file_to_edit']))
}
else
{
- $content_file = "{* " . l10n('locfiledit_newfile') . " *}\n\n";
+ $content_file = '';
}
}
@@ -51,7 +51,7 @@ if (isset($_POST['create_tpl']))
else
{
$edited_file = $_POST['tpl_parent'] . '/' . $filename;
- $content_file = ($_POST['tpl_model'] == '0') ? $new_file['tpl'] : file_get_contents($_POST['tpl_model']);
+ $content_file = ($_POST['tpl_model'] == '0') ? '' : file_get_contents($_POST['tpl_model']);
}
}