harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

missing iconfig conversion

Browse Source
This commit is contained in:
redmatrix 2016-06-13 21:16:36 -07:00
parent 8e5948716e
commit 1ff9abe1b4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/text.php
View File

@ -1744,7 +1744,7 @@ function unamp($s) {
function layout_select($channel_id, $current = '') { function layout_select($channel_id, $current = '') {
$r = q("select mid, v from item left join iconfig on iconfig.iid = item.id $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($channel_id),
intval(ITEM_TYPE_PDL) 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 // 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 // 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="") { function pdl_selector($uid, $current="") {
$o = ''; $o = '';
$sql_extra = item_permissions_sql($uid); $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) intval($uid)
); );
@ -2842,7 +2845,7 @@ function pdl_selector($uid, $current="") {
$entries[] = array('title' => t('Default'), 'mid' => ''); $entries[] = array('title' => t('Default'), 'mid' => '');
foreach($entries as $selection) { foreach($entries as $selection) {
$selected = (($selection == $current) ? ' selected="selected" ' : ''); $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>'; $o .= '</select>';