Beanz/flatpress
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into issue94_smartyupdate

Browse Source
This commit is contained in:
azett 2022-06-19 12:49:49 +02:00
commit db6f22f25b
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/panels/uploader/admin.uploader.php
View File

@ -29,9 +29,10 @@ class admin_uploader_default extends AdminPanelAction {
);
function main() {
if ($f = sess_remove('admin_uploader_files'))
if ($f = sess_remove('admin_uploader_files')) {
$this->smarty->assign('uploaded_files', $f);
}
}
function onupload() {
$success = false;
@ -97,6 +98,7 @@ class admin_uploader_default extends AdminPanelAction {
// I've not put BMPs
$uploaded_files = array();
$this->smarty->assign('uploaded_files', $uploaded_files);
foreach ($_FILES ["upload"] ["error"] as $key => $error) {

2
setup/lang/lang.en-us.php
View File

@ -119,7 +119,7 @@ You can find two [b]static pages[/b] ready to accept your contents:
[h4]Widgets[/h4]
There isn\'t a single fixed element in the sidebar(s). All the elements you can find in the bars sourrounding this text are completely positionable, and most of them are customizable as well. Some themes even provide a panel interface in the admin area.
There isn\'t a single fixed element in the sidebar(s). All the elements you can find in the bars surrounding this text are completely positionable, and most of them are customizable as well. Some themes even provide a panel interface in the admin area.
These elements are called [b]widgets[/b]. For more on widgets and [url=https://wiki.flatpress.org/doc:tips:widgets]some tips[/url] to get nice effects, take a look at the [url=https://wiki.flatpress.org/]wiki[/url].

2
setup/lang/lang.ja-jp.php
View File

@ -123,7 +123,7 @@ We have created some more sample content, to show you some of the FP well hidden
[h4]Widgets[/h4]
There isn\'t a single fixed element in the sidebar(s). All the elements you can find in the bars sourrounding this text are completely positionable, and most of them are customizable as well. Some themes even provide a panel interface in the admin area.
There isn\'t a single fixed element in the sidebar(s). All the elements you can find in the bars surrounding this text are completely positionable, and most of them are customizable as well. Some themes even provide a panel interface in the admin area.
These elements are called [url=http://wiki.flatpress.org/doc:widgets]widgets[/url].