aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-11-08 18:15:57 -0800
committerzotlabs <mike@macgirvin.com>2016-11-08 18:15:57 -0800
commit74947d1c1cb7c669ef2a167990066b34d89b5b07 (patch)
treec0c22dd1d190c23e6a93043be07d0e2ff1381701 /include
parentdb3d230ad9a63ac9363fc3f3a658f8b6c3c5eab4 (diff)
downloadvolse-hubzilla-74947d1c1cb7c669ef2a167990066b34d89b5b07.tar.gz
volse-hubzilla-74947d1c1cb7c669ef2a167990066b34d89b5b07.tar.bz2
volse-hubzilla-74947d1c1cb7c669ef2a167990066b34d89b5b07.zip
deprecate/remove get_channel_by_nick() which is just a less generalised variant of channelx_by_nick()
Diffstat (limited to 'include')
-rw-r--r--include/channel.php9
-rw-r--r--include/widgets.php2
2 files changed, 2 insertions, 9 deletions
diff --git a/include/channel.php b/include/channel.php
index 1f12e9927..c02d5266e 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1532,19 +1532,12 @@ function remote_online_status($webbie) {
}
-function get_channel_by_nick($nick) {
- $r = q("select * from channel where channel_address = '%s' limit 1",
- dbesc($nick)
- );
- return(($r) ? $r[0] : false);
-
-}
-
/**
* @brief
*
* @return string
*/
+
function identity_selector() {
if (local_channel()) {
$r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and channel_removed = 0 order by channel_name ",
diff --git a/include/widgets.php b/include/widgets.php
index 6cff4e4b7..ff97b8bd5 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -905,7 +905,7 @@ function widget_wiki_list($arr) {
// This should not occur because /wiki should redirect to /wiki/channel ...
$channel = \App::get_channel();
} else {
- $channel = get_channel_by_nick(argv(1)); // Channel being viewed by observer
+ $channel = channelx_by_nick(argv(1)); // Channel being viewed by observer
}
if (!$channel) {
return '';