aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2022-01-19 09:41:16 +0000
committerMario <mario@mariovavti.com>2022-01-19 09:41:16 +0000
commitdf71168ab76531b399829ebad3f363b563f135ad (patch)
tree166e2eba2c1168aec8bb29de7fa2bf66c514b646
parente93b26bf546d4e94ceefc071a0ac9bd1faadc91b (diff)
downloadvolse-hubzilla-df71168ab76531b399829ebad3f363b563f135ad.tar.gz
volse-hubzilla-df71168ab76531b399829ebad3f363b563f135ad.tar.bz2
volse-hubzilla-df71168ab76531b399829ebad3f363b563f135ad.zip
fix channel app naming and translation and cleanup apps with an db update
-rw-r--r--Zotlabs/Lib/Apps.php4
-rw-r--r--Zotlabs/Module/Channel.php2
-rw-r--r--Zotlabs/Update/_1251.php23
-rw-r--r--app/channel.apd4
-rw-r--r--boot.php2
5 files changed, 29 insertions, 6 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index 6ce052b06..a6b5c192c 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -70,7 +70,7 @@ class Apps {
'Contact Roles',
'Network',
'Files',
- 'Channel Home',
+ 'Channel',
'Photos',
'Calendar',
'Directory',
@@ -344,7 +344,7 @@ class Apps {
'Files' => t('Files'),
'Webpages' => t('Webpages'),
'Wiki' => t('Wiki'),
- 'Channel Home' => t('Channel Home'),
+ 'Channel' => t('Channel'),
'View Profile' => t('View Profile'),
'Photos' => t('Photos'),
'Calendar' => t('Calendar'),
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 1bf69dc4c..aebc70c15 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -224,7 +224,7 @@ class Channel extends Controller {
if (!$update) {
- nav_set_selected(t('Channel'));
+ nav_set_selected('Channel');
// search terms header
if ($search) {
diff --git a/Zotlabs/Update/_1251.php b/Zotlabs/Update/_1251.php
new file mode 100644
index 000000000..ee72075d1
--- /dev/null
+++ b/Zotlabs/Update/_1251.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1251 {
+
+ function run() {
+
+ dbq("START TRANSACTION");
+
+ $r = dbq("DELETE FROM app WHERE (app_name = 'Channel Home' OR app_name = 'Permission Categories') AND app_system = 1");
+
+ if($r) {
+ dbq("COMMIT");
+ return UPDATE_SUCCESS;
+ }
+
+ dbq("ROLLBACK");
+ return UPDATE_FAILED;
+
+ }
+
+}
diff --git a/app/channel.apd b/app/channel.apd
index db453d6f1..7e7727ebe 100644
--- a/app/channel.apd
+++ b/app/channel.apd
@@ -1,7 +1,7 @@
-version: 3
+version: 4
url: $baseurl/channel/$nick, $baseurl/settings/channel_home
requires: local_channel
-name: Channel Home
+name: Channel
photo: icon:home
categories: nav_featured_app, Personal
desc: Your channel homepage featuring your personal posts.
diff --git a/boot.php b/boot.php
index 6bce39f7f..a6127865c 100644
--- a/boot.php
+++ b/boot.php
@@ -58,7 +58,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '7.1' );
define ( 'ZOT_REVISION', '6.0' );
-define ( 'DB_UPDATE_VERSION', 1250 );
+define ( 'DB_UPDATE_VERSION', 1251 );
define ( 'PROJECT_BASE', __DIR__ );