diff options
| author | mrjive <mrjive@mrjive.it> | 2015-09-22 13:11:54 +0200 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2015-09-22 13:11:54 +0200 |
| commit | 5ec3d3e36d8bb7918b844b4ebbeb878c4b45e30d (patch) | |
| tree | ece0274497ae0f3bc427cfa6e8f10752dd9934dc /mod/locs.php | |
| parent | 49d11ed9f88531bcd03f2f129230b0352014c22c (diff) | |
| parent | 4b13f0e025b08263d7231845bc76034d9adc7847 (diff) | |
| download | volse-hubzilla-5ec3d3e36d8bb7918b844b4ebbeb878c4b45e30d.tar.gz volse-hubzilla-5ec3d3e36d8bb7918b844b4ebbeb878c4b45e30d.tar.bz2 volse-hubzilla-5ec3d3e36d8bb7918b844b4ebbeb878c4b45e30d.zip | |
Merge pull request #3 from redmatrix/master
updating from original codebase
Diffstat (limited to 'mod/locs.php')
| -rw-r--r-- | mod/locs.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/mod/locs.php b/mod/locs.php index 3f8bd9029..3c6a5da67 100644 --- a/mod/locs.php +++ b/mod/locs.php @@ -50,8 +50,17 @@ function locs_post(&$a) { return; } if(intval($r[0]['hubloc_primary'])) { - notice( t('Primary location cannot be removed.') . EOL); - return; + $x = q("select hubloc_id from hubloc where hubloc_primary = 1 and hubloc_hash = '%s'", + dbesc($channel['channel_hash']) + ); + if(! $x) { + notice( t('Location lookup failed.')); + return; + } + if(count($x) == 1) { + notice( t('Please select another location to become primary before removing the primary location.') . EOL); + return; + } } $r = q("update hubloc set hubloc_deleted = 1 where hubloc_id = %d and hubloc_hash = '%s'", @@ -91,8 +100,6 @@ function locs_content(&$a) { $r[$x]['deleted'] = (intval($r[$x]['hubloc_deleted']) ? true : false); } - - $o = replace_macros(get_markup_template('locmanage.tpl'), array( '$header' => t('Manage Channel Locations'), '$loc' => t('Location (address)'), |