aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-10-30 16:21:24 -0700
committerfriendica <info@friendica.com>2012-10-30 16:21:24 -0700
commitffadf260c0682e069ef81fe34c75e1217b7e37fb (patch)
tree8d1322d8a3b4ac47b9dfab8b5c0e56b01d1bbd23
parentdca20f42278e9d837d5cbfd130fc04ecaf09947d (diff)
downloadvolse-hubzilla-ffadf260c0682e069ef81fe34c75e1217b7e37fb.tar.gz
volse-hubzilla-ffadf260c0682e069ef81fe34c75e1217b7e37fb.tar.bz2
volse-hubzilla-ffadf260c0682e069ef81fe34c75e1217b7e37fb.zip
fix channel creation and management after last changes
-rw-r--r--mod/manage.php3
-rw-r--r--version.inc2
-rw-r--r--view/js/mod_new_channel.js4
-rw-r--r--view/tpl/channel.tpl2
-rw-r--r--view/tpl/new_channel.tpl2
5 files changed, 6 insertions, 7 deletions
diff --git a/mod/manage.php b/mod/manage.php
index 57d33d086..9fbcea55d 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -22,8 +22,7 @@ function manage_content(&$a) {
$channels = null;
if(local_user()) {
- $r = q("select channel.*, contact.* from channel left join contact on channel.channel_id = contact.uid
- where channel.channel_account_id = %d and contact.self = 1",
+ $r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d ",
intval(get_account_id())
);
diff --git a/version.inc b/version.inc
index feff79e46..a4bc5b083 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-10-29.122
+2012-10-30.123
diff --git a/view/js/mod_new_channel.js b/view/js/mod_new_channel.js
index 02b6f857e..a3c1dd05c 100644
--- a/view/js/mod_new_channel.js
+++ b/view/js/mod_new_channel.js
@@ -1,14 +1,14 @@
$(document).ready(function() {
$("#newchannel-name").blur(function() {
var zreg_name = $("#newchannel-name").val();
- $.get("newchannel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) {
+ $.get("new_channel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) {
$("#newchannel-nickname").val(data);
zFormError("#newchannel-name-feedback",data.error);
});
});
$("#newchannel-nickname").blur(function() {
var zreg_nick = $("#newchannel-nickname").val();
- $.get("newchannel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) {
+ $.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) {
$("#newchannel-nickname").val(data);
zFormError("#newchannel-nickname-feedback",data.error);
});
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
index 0702bb50b..98c19caa5 100644
--- a/view/tpl/channel.tpl
+++ b/view/tpl/channel.tpl
@@ -1,5 +1,5 @@
<div class="channel-selection">
-<a href="$channel.link" class="channel-selection-photo-link" title="$channel.channel_name"><img class="channel-photo" src="$channel.thumb" alt="$channel.channel_name" /></a>
+<a href="$channel.link" class="channel-selection-photo-link" title="$channel.channel_name"><img class="channel-photo" src="$channel.xchan_photo_m" alt="$channel.channel_name" /></a>
<a href="$channel.link" class="channel-selection-name-link" title="$channel.channel_name"><div class="channel-name">$channel.channel_name</div></a>
</div>
<div class="channel-selection-end"></div>
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index b9171644a..f83bc3a11 100644
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -1,6 +1,6 @@
<h2>$title</h2>
-<form action="newchannel" method="post" id="newchannel-form">
+<form action="new_channel" method="post" id="newchannel-form">
<div id="newchannel-desc" class="descriptive-paragraph">$desc</div>