aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-10-02 12:56:35 +0000
committerMario <mario@mariovavti.com>2021-10-02 12:56:35 +0000
commit574a01727ec500ee0c6be0965c5021927c802d52 (patch)
treec548d5fd6ec3cc41cfc9dd5c393b1180e839448b
parentb5cea3301d22185e7278a87176901e82419dafbb (diff)
downloadvolse-hubzilla-574a01727ec500ee0c6be0965c5021927c802d52.tar.gz
volse-hubzilla-574a01727ec500ee0c6be0965c5021927c802d52.tar.bz2
volse-hubzilla-574a01727ec500ee0c6be0965c5021927c802d52.zip
fix removed channels counted for max id check and disable moving until we decide what to do with it
-rw-r--r--Zotlabs/Module/Import.php4
-rw-r--r--view/tpl/channel_import.tpl2
2 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php
index 7898f83a3..eee72b945 100644
--- a/Zotlabs/Module/Import.php
+++ b/Zotlabs/Module/Import.php
@@ -40,7 +40,7 @@ class Import extends Controller {
$data = null;
$seize = ((x($_REQUEST, 'make_primary')) ? intval($_REQUEST['make_primary']) : 0);
$import_posts = ((x($_REQUEST, 'import_posts')) ? intval($_REQUEST['import_posts']) : 0);
- $moving = intval($_REQUEST['moving']);
+ $moving = false; //intval($_REQUEST['moving']);
$src = $_FILES['filename']['tmp_name'];
$filename = basename($_FILES['filename']['name']);
$filesize = intval($_FILES['filename']['size']);
@@ -158,7 +158,7 @@ class Import extends Controller {
$max_identities = account_service_class_fetch($account_id, 'total_identities');
if ($max_identities !== false) {
- $r = q("select channel_id from channel where channel_account_id = %d",
+ $r = q("select channel_id from channel where channel_account_id = %d and channel_removed = 0",
intval($account_id)
);
if ($r && count($r) > $max_identities) {
diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl
index c7cbb1742..bbd53cbb5 100644
--- a/view/tpl/channel_import.tpl
+++ b/view/tpl/channel_import.tpl
@@ -23,7 +23,7 @@
<div id="import-common-desc" class="section-content-info-wrapper">{{$common}}</div>
{{include file="field_checkbox.tpl" field=$make_primary}}
- {{include file="field_checkbox.tpl" field=$moving}}
+ {{* include file="field_checkbox.tpl" field=$moving *}}
{{include file="field_input.tpl" field=$newname}}
<div id="import-common-desc" class="section-content-info-wrapper">{{$pleasewait}}</div>