mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-06-22 17:29:57 -04:00
Merge branch 'master' of git@github.com:/gallery/gallery3
Conflicts: modules/server_add/controllers/admin_server_add.php
This commit is contained in:
@@ -38,7 +38,7 @@ class Admin_Server_Add_Controller extends Admin_Controller {
|
||||
$path = $form->add_path->path->value;
|
||||
$paths[$path] = 1;
|
||||
module::set_var("server_add", "authorized_paths", serialize($paths));
|
||||
message::success(t("Added path %path", array("path" => $path)));
|
||||
message::success(t("Added path %path", array("path" => p::clean($path))));
|
||||
server_add::check_config($paths);
|
||||
url::redirect("admin/server_add");
|
||||
} else {
|
||||
@@ -60,11 +60,10 @@ class Admin_Server_Add_Controller extends Admin_Controller {
|
||||
$paths = unserialize(module::get_var("server_add", "authorized_paths"));
|
||||
if (isset($paths[$path])) {
|
||||
unset($paths[$path]);
|
||||
message::success(t("Removed path %path", array("path" => $path)));
|
||||
message::success(t("Removed path %path", array("path" => p::clean($path))));
|
||||
module::set_var("server_add", "authorized_paths", serialize($paths));
|
||||
server_add::check_config($paths);
|
||||
}
|
||||
|
||||
url::redirect("admin/server_add");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user