mirror of
https://github.com/Piwigo/Piwigo.git
synced 2025-04-27 03:39:57 +03:00
delete replace_space function, modify get_cat_display_name_* functions
git-svn-id: http://piwigo.org/svn/trunk@25425 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
ca80b5ade8
commit
e6722ac1b4
10 changed files with 13 additions and 85 deletions
|
@ -31,12 +31,9 @@
|
|||
*
|
||||
* @param array cat_informations
|
||||
* @param string url
|
||||
* @param boolean replace_space
|
||||
* @return string
|
||||
*/
|
||||
function get_cat_display_name($cat_informations,
|
||||
$url = '',
|
||||
$replace_space = false)
|
||||
function get_cat_display_name($cat_informations, $url = '')
|
||||
{
|
||||
global $conf;
|
||||
|
||||
|
@ -86,14 +83,7 @@ function get_cat_display_name($cat_informations,
|
|||
$output.= $cat['name'].'</a>';
|
||||
}
|
||||
}
|
||||
if ($replace_space)
|
||||
{
|
||||
return replace_space($output);
|
||||
}
|
||||
else
|
||||
{
|
||||
return $output;
|
||||
}
|
||||
return $output;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -106,12 +96,10 @@ function get_cat_display_name($cat_informations,
|
|||
*
|
||||
* @param string uppercats
|
||||
* @param string url
|
||||
* @param boolean replace_space
|
||||
* @return string
|
||||
*/
|
||||
function get_cat_display_name_cache($uppercats,
|
||||
$url = '',
|
||||
$replace_space = false,
|
||||
$single_link = false,
|
||||
$link_class = null)
|
||||
{
|
||||
|
@ -184,14 +172,7 @@ SELECT id, name, permalink
|
|||
$output.= '</a>';
|
||||
}
|
||||
|
||||
if ($replace_space)
|
||||
{
|
||||
return replace_space($output);
|
||||
}
|
||||
else
|
||||
{
|
||||
return $output;
|
||||
}
|
||||
return $output;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -230,12 +211,10 @@ function render_comment_content($content)
|
|||
return $content;
|
||||
}
|
||||
|
||||
function get_cat_display_name_from_id($cat_id,
|
||||
$url = '',
|
||||
$replace_space = false)
|
||||
function get_cat_display_name_from_id($cat_id, $url = '')
|
||||
{
|
||||
$cat_info = get_cat_info($cat_id);
|
||||
return get_cat_display_name($cat_info['upper_names'], $url, $replace_space);
|
||||
return get_cat_display_name($cat_info['upper_names'], $url);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue