aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-06-13 21:16:36 -0700
committerredmatrix <git@macgirvin.com>2016-06-13 21:16:36 -0700
commit1ff9abe1b4b5570c790ed6956f4e5eda58587379 (patch)
tree4134a7a41ed35f00fa6f8e58bab4178d7d7bd731
parent8e5948716e1d4bba008171de541358b5b27031ba (diff)
downloadvolse-hubzilla-1ff9abe1b4b5570c790ed6956f4e5eda58587379.tar.gz
volse-hubzilla-1ff9abe1b4b5570c790ed6956f4e5eda58587379.tar.bz2
volse-hubzilla-1ff9abe1b4b5570c790ed6956f4e5eda58587379.zip
missing iconfig conversion
-rw-r--r--include/text.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/include/text.php b/include/text.php
index aca980203..bd59aa732 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1744,7 +1744,7 @@ function unamp($s) {
function layout_select($channel_id, $current = '') {
$r = q("select mid, v from item left join iconfig on iconfig.iid = item.id
- where iconfig.cat = 'system' and iconfig.k = 'PDL' and item_id.uid = %d and item_type = %d ",
+ where iconfig.cat = 'system' and iconfig.k = 'PDL' and item.uid = %d and item_type = %d ",
intval($channel_id),
intval(ITEM_TYPE_PDL)
);
@@ -2822,13 +2822,16 @@ function expand_acl($s) {
// If it has a pdl we'll load it as we know the mid and pass the body through comanche_parser() which will generate the
// page layout from the given description
+// @FIXME - there is apparently a very similar function called layout_select; this one should probably take precedence
+// and the other should be checked for compatibility and removed
function pdl_selector($uid, $current="") {
$o = '';
$sql_extra = item_permissions_sql($uid);
- $r = q("select item_id.*, mid from item_id left join item on iid = item.id where item_id.uid = %d and item_id.uid = item.uid and service = 'PDL' $sql_extra order by sid asc",
+ $r = q("select iconfig.*, mid from item_id left join item on iconfig.iid = item.id
+ where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' $sql_extra order by v asc",
intval($uid)
);
@@ -2842,7 +2845,7 @@ function pdl_selector($uid, $current="") {
$entries[] = array('title' => t('Default'), 'mid' => '');
foreach($entries as $selection) {
$selected = (($selection == $current) ? ' selected="selected" ' : '');
- $o .= "<option value=\"{$selection['mid']}\" $selected >{$selection['sid']}</option>";
+ $o .= "<option value=\"{$selection['mid']}\" $selected >{$selection['v']}</option>";
}
$o .= '</select>';