Commit 7505d087 authored by Jonny Bradley's avatar Jonny Bradley

[MRG] Automatic merge, branches/6.x 30756 to 30823

Manually fixed conflicts in
	lib/wiki-plugins/wikiplugin_flash.php
	lib/wiki-plugins/wikiplugin_file.php
	lib/wiki-plugins/wikiplugin_youtube.php
	lib/tikilib.php
	lib/jquery_tiki/tiki-jquery.js
	tiki-interactive_trans.php
	templates/tiki-admin_menu_options.tpl
(editors please check)
parent 873b77e9
......@@ -3412,6 +3412,7 @@ pics/icons/eye_group.png -text
pics/icons/eye_group_arrow_down.png -text
pics/icons/eye_magnifier.png -text
pics/icons/feed.png -text
pics/icons/file-manager.png -text
pics/icons/find.png -text
pics/icons/flag_blue.png -text
pics/icons/folder.png -text
......
......@@ -21,9 +21,9 @@ $fgal_listing_conf = array(
'size' => array('name' => tra('Size')),
'created' => array('name' => tra('Created').' / '.tra('Uploaded')),
'lastModif' => array('name' => tra('Last Modified'), 'key' => 'show_modified'),
'creator' => array('name' => tra('Creator')),
'author' => array('name' => tra('Author')),
'last_user' => array('name' => tra('Last editor')),
'creator' => array('name' => tra('Uploaded by')), //this used to be Creator but updated Nov2010
'author' => array('name' => tra('Creator')), //this used to be Author but updated Nov2010
'last_user' => array('name' => tra('Last Modified by')), //this used to be 'Last editor' but updated Nov2010
'comment' => array('name' => tra('Comment')),
'files' => array('name' => tra('Files')),
'hits' => array('name' => tra('Hits')),
......
......@@ -135,7 +135,7 @@ objects:
description:
name: Image
documentation: PluginImage
description: Display images
description: Display images (transitional alias, use IMG plugin instead)
params:
fileId:
required: false
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -218,7 +218,7 @@ function breadcrumb_getTitle($crumbs, $loc) {
*/
/* static */
function _breadcrumb_getTitle($crumbs, $loc) {
global $prefs, $print_page, $info, $structure, $structure_path, $tikilib;
global $prefs, $print_page, $info, $structure, $structure_path, $tikilib, $smarty;
if ( $prefs['feature_breadcrumbs'] == 'n' || $prefs['feature_sitetitle'] == 'title' ) {
$ret = '<strong><a title="';
......@@ -237,7 +237,8 @@ function _breadcrumb_getTitle($crumbs, $loc) {
}
$ret .= 'refresh';
$ret .= '" accesskey="'.($cnt);
$ret .= '" href="'.$crumbs[$len-1]->url.'">';
include_once('tiki-sefurl.php');
$ret .= '" href="'.filter_out_sefurl($crumbs[$len-1]->url, $smarty).'">';
if ($prefs['feature_breadcrumbs'] == 'n' && $loc == "admin")
$ret .= tra("Administration:")." ";
if ($prefs['wikiapproval_hideprefix'] == 'y' && $approved = $tikilib->get_approved_page( $crumbs[$len-1]->title ) ) {
......
......@@ -3,6 +3,7 @@
jQuery(document).ready(function() {
jQuery('#captchaRegenerate').click(function() {
generateCaptcha();
return false;
});
});
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment