- merge r 2117 from trunk (render_category_description and render_category_literal_description events refactoring)

- fix admin multiview plugin

git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2118 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2007-10-02 05:42:22 +00:00
parent 58977351dd
commit 530e3e6974
7 changed files with 47 additions and 29 deletions
+11 -6
View File
@@ -204,7 +204,11 @@ if ('categories' == $page['section'])
$page = array_merge(
$page,
array(
'comment' => $page['category']['comment'],
'comment' =>
trigger_event(
'render_category_description',
$page['category']['comment']
),
'title' =>
get_cat_display_name($page['category']['upper_names'], '', false),
)
@@ -331,7 +335,8 @@ SELECT DISTINCT(id)
$page = array_merge(
$page,
array(
'title' => $lang['search_result'],
'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
.$lang['search_result'].'</a>',
)
);
}
@@ -385,7 +390,7 @@ SELECT DISTINCT(id)
$page = array_merge(
$page,
array(
'title' => '<a href="'.duplicate_index_url().'">'
'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
.$lang['recent_pics_cat'].'</a>',
'items' => array_from_query($query, 'id'),
)
@@ -423,7 +428,7 @@ SELECT DISTINCT(id)
$page = array_merge(
$page,
array(
'title' => '<a href="'.duplicate_index_url().'">'
'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
.$conf['top_number'].' '.$lang['most_visited_cat'].'</a>',
'items' => array_from_query($query, 'id'),
)
@@ -449,7 +454,7 @@ SELECT DISTINCT(id)
$page = array_merge(
$page,
array(
'title' => '<a href="'.duplicate_index_url().'">'
'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
.$conf['top_number'].' '.$lang['best_rated_cat'].'</a>',
'items' => array_from_query($query, 'id'),
)
@@ -472,7 +477,7 @@ SELECT DISTINCT(id)
$page = array_merge(
$page,
array(
'title' => '<a href="'.duplicate_index_url().'">'
'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
.$lang['random_cat'].'</a>',
'items' => array_from_query($query, 'id'),
)