aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/dir_fns.php6
-rw-r--r--mod/directory.php2
-rw-r--r--view/js/main.js2
-rw-r--r--view/js/mod_directory.js2
-rwxr-xr-xview/tpl/direntry.tpl2
5 files changed, 8 insertions, 6 deletions
diff --git a/include/dir_fns.php b/include/dir_fns.php
index 8bec974fb..af6f78c01 100644
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -53,6 +53,8 @@ function check_upstream_directory() {
function dir_sort_links() {
// Build urls without order and pubforums so it's easy to tack on the changed value
// Probably there's an easier way to do this
+
+ $current_order = (($_REQUEST['order']) ? $_REQUEST['order'] : 'normal');
$url = 'directory?';
$tmp = $_REQUEST;
unset($tmp['order']);
@@ -71,7 +73,7 @@ function dir_sort_links() {
'$pubforums' => t('Public Forums Only'),
'$pubforumsonly' => x($_REQUEST,'pubforums') ? $_REQUEST['pubforums'] : '',
'$sort' => t('Sort'),
- '$selected_sort' => x($_REQUEST,'order') ? $_REQUEST['order'] : 'normal',
+ '$selected_sort' => $current_order,
'$sorturl' => $sorturl,
'$forumsurl' => $forumsurl,
@@ -230,7 +232,7 @@ function update_directory_entry($ud) {
function local_dir_update($uid,$force) {
- logger('local_dir_update', LOGGER_DEBUG);
+ logger('local_dir_update: uid: ' . $uid, LOGGER_DEBUG);
$p = q("select channel.channel_hash, channel_address, channel_timezone, profile.* from profile left join channel on channel_id = uid where uid = %d and is_default = 1",
intval($uid)
diff --git a/mod/directory.php b/mod/directory.php
index 98d81f947..4ceda293d 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -130,7 +130,7 @@ function directory_content(&$a) {
if(! is_null($pubforums))
$query .= '&pubforums=' . intval($pubforums);
- $sort_order = ((x($_REQUEST,'order')) ? $_REQUEST['order'] : '');
+ $sort_order = ((x($_REQUEST,'order')) ? $_REQUEST['order'] : 'normal');
if($sort_order)
$query .= '&order=' . urlencode($sort_order);
diff --git a/view/js/main.js b/view/js/main.js
index d2099b815..a851e7e63 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -594,7 +594,7 @@ function updateConvItems(mode,data) {
function collapseHeight() {
- $(".wall-item-body, .directory-item").each(function() {
+ $(".wall-item-body, .contact-info").each(function() {
if($(this).height() > divmore_height + 10) {
if(! $(this).hasClass('divmore')) {
$(this).divgrow({ initialHeight: divmore_height, moreText: aStr['divgrowmore'], lessText: aStr['divgrowless'], showBrackets: false });
diff --git a/view/js/mod_directory.js b/view/js/mod_directory.js
index 40a094803..74c8b414d 100644
--- a/view/js/mod_directory.js
+++ b/view/js/mod_directory.js
@@ -8,4 +8,4 @@ function dirdetails(hash) {
$(document).ready(function() {
collapseHeight();
-} \ No newline at end of file
+}); \ No newline at end of file
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index e77744e00..cdc6f1f97 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -1,4 +1,4 @@
-<div class="directory-item lframe divmore" id="directory-item-{{$entry.id}}" >
+<div class="directory-item lframe" id="directory-item-{{$entry.id}}" >
<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" >
<div class="contact-photo" id="directory-photo-{{$entry.id}}" >