More bugs fixes on resource editing, a=chris
More bugs fixes on resource editing, a=chris
diff --git a/src/controllers/components/SocialComponent.php b/src/controllers/components/SocialComponent.php
index f812d3010..24f59a6fc 100644
--- a/src/controllers/components/SocialComponent.php
+++ b/src/controllers/components/SocialComponent.php
@@ -1717,7 +1717,7 @@ class SocialComponent extends Component implements CrawlConstants
$data["GROUP"] = $group;
if (in_array($data["MODE"], ["api", "read", "edit", "media",
"source"])) {
- if (empty($data["PAGE"])) {
+ if (!isset($data["PAGE"]) || $data["PAGE"] === false) {
$data["PAGE_NAME"] = $page_name;
if (isset($search_page_info) && $search_page_info) {
$page_info = $search_page_info;
@@ -1729,7 +1729,7 @@ class SocialComponent extends Component implements CrawlConstants
$data["PAGE_ID"] = $page_info["ID"];
$data["DISCUSS_THREAD"] = $page_info["DISCUSS_THREAD"];
}
- if (empty($data["PAGE"]) &&
+ if ((!isset($data["PAGE"]) || $data["PAGE"] === false) &&
$data['CURRENT_LOCALE_TAG'] != C\DEFAULT_LOCALE) {
//fallback to default locale for translation
$page_info = $group_model->getPageInfoByName(
diff --git a/src/models/GroupModel.php b/src/models/GroupModel.php
index e09b88270..43b68fb80 100644
--- a/src/models/GroupModel.php
+++ b/src/models/GroupModel.php
@@ -1491,7 +1491,7 @@ class GroupModel extends Model implements MediaConstants
$i++;
} while (file_exists($file_name));
if ($resource_type == 'new-file') {
- return file_put_contents($file_name, "");
+ return (file_put_contents($file_name, "") !== false);
}
return mkdir($file_name);
}
diff --git a/src/views/elements/WikiElement.php b/src/views/elements/WikiElement.php
index 445de3e8c..641da08de 100644
--- a/src/views/elements/WikiElement.php
+++ b/src/views/elements/WikiElement.php
@@ -307,7 +307,7 @@ class WikiElement extends Element implements CrawlConstants
C\CSRF_TOKEN.'='.$data[C\CSRF_TOKEN];
$base_url = htmlentities($simple_base_url);
$edit_url = htmlentities(B\wikiUrl($data['PAGE_NAME'], true,
- $data['CONTROLLER'], $data['GROUP']['GROUP_ID']) .
+ $data['CONTROLLER'], $data['GROUP']['GROUP_ID']) .
C\CSRF_TOKEN . '=' . $data[C\CSRF_TOKEN] . "&arg=edit");
if (isset($data['OTHER_BACK_URL'])) {
$append = $data['OTHER_BACK_URL'];
@@ -571,7 +571,7 @@ class WikiElement extends Element implements CrawlConstants
tl("wiki_element_rename_failed") ?></h1>');
return;
}
- var location = "<?= "$simple_base_url&arg=edit&page_name=".
+ var location = "<?= "$simple_base_url&arg=edit&a=wiki&page_name=".
$data['PAGE_NAME']. $rename_sub_path
?>" + "&new_resource_name=" + new_name +
"&old_resource_name=" + old_name.replace('"','"');