mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

fixed requested changes, array processing of multilingual_stip_langs

Browse Source
This commit is contained in:
Stephan Brunker 2019-10-15 22:45:02 +02:00
parent 502b837dd6
commit ea371f6a4e
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/functions_entries.inc.php
View File

@ -145,16 +145,13 @@ function &serendipity_fetchEntryCategories($entryid) {
WHERE ec.entryid = {$entryid} WHERE ec.entryid = {$entryid}
ORDER BY c.category_name ASC"; ORDER BY c.category_name ASC";
$cat =& serendipity_db_query($query); $cat =& serendipity_db_query($query,false,'assoc');
if (!is_array($cat)) { if (!is_array($cat)) {
$arr = array(); $arr = array();
return $arr; return $arr;
} else { } else {
foreach ($cat as $key => $catdata) { serendipity_plugin_api::hook_event('multilingual_strip_langs',$cat, array('category_name','category_description'));
serendipity_plugin_api::hook_event('multilingual_strip_langs',$cat[$key]['category_name']);
serendipity_plugin_api::hook_event('multilingual_strip_langs',$cat[$key]['category_description']);
}
return $cat; return $cat;
} }
} }
@ -515,9 +512,8 @@ function serendipity_fetchEntryData(&$ret) {
$search_ret =& serendipity_db_query($query, false, 'assoc'); $search_ret =& serendipity_db_query($query, false, 'assoc');
if (is_array($search_ret)) { if (is_array($search_ret)) {
serendipity_plugin_api::hook_event('multilingual_strip_langs', $search_ret, array('category_name','category_description'));
foreach($search_ret AS $i => $entry) { foreach($search_ret AS $i => $entry) {
serendipity_plugin_api::hook_event('multilingual_strip_langs',$entry['category_name']);
serendipity_plugin_api::hook_event('multilingual_strip_langs',$entry['category_description']);
$ret[$assoc_ids[$entry['entryid']]]['categories'][] = $entry; $ret[$assoc_ids[$entry['entryid']]]['categories'][] = $entry;
} }
} }
@ -728,16 +724,13 @@ function &serendipity_fetchCategories($authorid = null, $name = null, $order = n
$cats = serendipity_walkRecursive($ret, 'categoryid', 'parentid', VIEWMODE_THREADED); $cats = serendipity_walkRecursive($ret, 'categoryid', 'parentid', VIEWMODE_THREADED);
$flat_cats = array(); $flat_cats = array();
$flat_cats[0] = NO_CATEGORY; $flat_cats[0] = NO_CATEGORY;
serendipity_plugin_api::hook_event('multilingual_strip_langs',$cats, array('category_name','category_description'));
foreach($cats AS $catidx => $catdata) { foreach($cats AS $catidx => $catdata) {
serendipity_plugin_api::hook_event('multilingual_strip_langs', $catdata['category_name']);
$flat_cats[$catdata['categoryid']] = str_repeat(' ', $catdata['depth']*2) . serendipity_specialchars($catdata['category_name']); $flat_cats[$catdata['categoryid']] = str_repeat(' ', $catdata['depth']*2) . serendipity_specialchars($catdata['category_name']);
} }
return $flat_cats; return $flat_cats;
} else { } else {
foreach ($ret as $key => $catdata) { serendipity_plugin_api::hook_event('multilingual_strip_langs',$ret, array('category_name','category_description'));
serendipity_plugin_api::hook_event('multilingual_strip_langs',$ret[$key]['category_name']);
serendipity_plugin_api::hook_event('multilingual_strip_langs',$ret[$key]['category_description']);
}
return $ret; return $ret;
} }
} }

6
plugins/serendipity_plugin_categories/serendipity_plugin_categories.php
View File

@ -213,6 +213,9 @@ class serendipity_plugin_categories extends serendipity_plugin
if (is_array($categories) && count($categories)) { if (is_array($categories) && count($categories)) {
$categories = serendipity_walkRecursive($categories, 'categoryid', 'parentid', VIEWMODE_THREADED); $categories = serendipity_walkRecursive($categories, 'categoryid', 'parentid', VIEWMODE_THREADED);
// strip language tags if multilingual plugin is active
serendipity_plugin_api::hook_event('multilingual_strip_langs', $categories, 'category_name');
foreach ($categories as $cid => $cat) { foreach ($categories as $cid => $cat) {
// Hide parents not wanted // Hide parents not wanted
if ($use_parent && $use_parent != 'all') { if ($use_parent && $use_parent != 'all') {
@ -255,9 +258,6 @@ class serendipity_plugin_categories extends serendipity_plugin
} }
} }
// strip language tags if multilingual plugin is active
serendipity_plugin_api::hook_event('multilingual_strip_langs',$cat['category_name']);
$categories[$cid]['feedCategoryURL'] = serendipity_feedCategoryURL($cat, 'serendipityHTTPPath'); $categories[$cid]['feedCategoryURL'] = serendipity_feedCategoryURL($cat, 'serendipityHTTPPath');
$categories[$cid]['categoryURL'] = serendipity_categoryURL($cat, 'serendipityHTTPPath'); $categories[$cid]['categoryURL'] = serendipity_categoryURL($cat, 'serendipityHTTPPath');
$categories[$cid]['paddingPx'] = $cat['depth']*6; $categories[$cid]['paddingPx'] = $cat['depth']*6;

3
plugins/serendipity_plugin_superuser/serendipity_plugin_superuser.php
View File

@ -46,8 +46,7 @@ class serendipity_plugin_superuser extends serendipity_plugin
$base = $serendipity['serendipityHTTPPath']; $base = $serendipity['serendipityHTTPPath'];
} }
//$link = $base . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] .'?/' : '') . PATH_ADMIN; $link = $base . ($serendipity['rewrite'] == 'none' ? 'serendipity_admin.php' : PATH_ADMIN);
$link = $base . 'serendipity_admin.php';
$text = (($_SESSION['serendipityAuthedUser'] === true) ? SUPERUSER_OPEN_ADMIN : SUPERUSER_OPEN_LOGIN); $text = (($_SESSION['serendipityAuthedUser'] === true) ? SUPERUSER_OPEN_ADMIN : SUPERUSER_OPEN_LOGIN);
echo '<a href="' . $link . '" rel="nofollow" title="'. $text .'">'. $text .'</a>'; echo '<a href="' . $link . '" rel="nofollow" title="'. $text .'">'. $text .'</a>';
} }