Merge pull request #479 from owncloud/fix_438
Do the url encoding once, only in breadcrumbs template
This commit is contained in:
commit
db2be74b4d
|
@ -25,7 +25,7 @@ if($doBreadcrumb) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$breadcrumbNav = new OCP\Template( "files", "part.breadcrumb", "" );
|
$breadcrumbNav = new OCP\Template( "files", "part.breadcrumb", "" );
|
||||||
$breadcrumbNav->assign( "breadcrumb", $breadcrumb );
|
$breadcrumbNav->assign( "breadcrumb", $breadcrumb, false );
|
||||||
|
|
||||||
$data['breadcrumb'] = $breadcrumbNav->fetchPage();
|
$data['breadcrumb'] = $breadcrumbNav->fetchPage();
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,7 +36,7 @@ if(!isset($_SESSION['timezone'])) {
|
||||||
}
|
}
|
||||||
OCP\App::setActiveNavigationEntry( 'files_index' );
|
OCP\App::setActiveNavigationEntry( 'files_index' );
|
||||||
// Load the files
|
// Load the files
|
||||||
$dir = isset( $_GET['dir'] ) ? rawurldecode(stripslashes($_GET['dir'])) : '';
|
$dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
|
||||||
// Redirect if directory does not exist
|
// Redirect if directory does not exist
|
||||||
if(!OC_Filesystem::is_dir($dir.'/')) {
|
if(!OC_Filesystem::is_dir($dir.'/')) {
|
||||||
header('Location: '.$_SERVER['SCRIPT_NAME'].'');
|
header('Location: '.$_SERVER['SCRIPT_NAME'].'');
|
||||||
|
@ -67,7 +67,7 @@ $breadcrumb = array();
|
||||||
$pathtohere = '';
|
$pathtohere = '';
|
||||||
foreach( explode( '/', $dir ) as $i ) {
|
foreach( explode( '/', $dir ) as $i ) {
|
||||||
if( $i != '' ) {
|
if( $i != '' ) {
|
||||||
$pathtohere .= '/'.str_replace('+', '%20', urlencode($i));
|
$pathtohere .= '/'.$i;
|
||||||
$breadcrumb[] = array( 'dir' => $pathtohere, 'name' => $i );
|
$breadcrumb[] = array( 'dir' => $pathtohere, 'name' => $i );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
<?php for($i=0; $i<count($_["breadcrumb"]); $i++):
|
<?php for($i=0; $i<count($_["breadcrumb"]); $i++):
|
||||||
$crumb = $_["breadcrumb"][$i]; ?>
|
$crumb = $_["breadcrumb"][$i];
|
||||||
<div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo urlencode($crumb["dir"]);?>' style='background-image:url("<?php echo OCP\image_path('core', 'breadcrumb.png');?>")'>
|
$dir = str_replace('+','%20', urlencode($crumb["dir"])); ?>
|
||||||
<a href="<?php echo $_['baseURL'].urlencode($crumb["dir"]); ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
|
<div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo $dir;?>' style='background-image:url("<?php echo OCP\image_path('core', 'breadcrumb.png');?>")'>
|
||||||
|
<a href="<?php echo $_['baseURL'].$dir; ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
|
||||||
</div>
|
</div>
|
||||||
<?php endfor;?>
|
<?php endfor;?>
|
||||||
|
|
Loading…
Reference in New Issue