diff options
| author | priyanka-m <priyanka.menghani@gmail.com> | 2012-11-13 12:52:29 +0400 |
|---|---|---|
| committer | priyanka-m <priyanka.menghani@gmail.com> | 2012-11-13 12:52:29 +0400 |
| commit | fd55af0d1f03ab3d9da9ef83789065bae7c3e315 (patch) | |
| tree | ad30c13e11236550c6b6482cebd5ac0a57dccfdb /reader | |
| parent | f5d1d25e5822ef8cf29112408246c551c916a99a (diff) | |
| parent | b26ba609155c865d2463fc08f8cfff743f959154 (diff) | |
Merge branch 'master' of https://github.com/owncloud/apps
Diffstat (limited to 'reader')
| -rwxr-xr-x | reader/js/integrate.js | 2 | ||||
| -rwxr-xr-x | reader/templates/index.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/reader/js/integrate.js b/reader/js/integrate.js index 79dec7ef6..aac47d8ba 100755 --- a/reader/js/integrate.js +++ b/reader/js/integrate.js @@ -58,7 +58,7 @@ function getAction(mime,type) { } else { name = function (filename){ - window.location=OC.linkTo('reader', 'index.php') + '&dir='+ + window.location=OC.linkTo('reader', 'index.php') + '?dir='+ encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+ encodeURIComponent(filename) + '/'; } diff --git a/reader/templates/index.php b/reader/templates/index.php index eb51f2c0b..c4b9a0738 100755 --- a/reader/templates/index.php +++ b/reader/templates/index.php @@ -12,7 +12,7 @@ include('apps/reader/lib/thumbnail.php'); // Get the current directory. $current_dir = empty($_['dir'])?'/':$_['dir']; - $base_url = OCP\Util::linkTo('reader', 'index.php').'&dir='; + $base_url = OCP\Util::linkTo('reader', 'index.php').'?dir='; $curr_path = ''; $path = explode( '/', trim($current_dir,'/')); @@ -104,7 +104,7 @@ <!-- Display folder name--> <tr id = "row" data-file="<?php echo $r[0];?>" data-type="dir"> <td class = "filename svg"> - <a class = "dirs" id = "<?php echo $r[0];?>" href = "<?php echo OCP\Util::linkTo('reader', 'index.php').'&dir='.$current_dir.$r[0].'/';?>"> + <a class = "dirs" id = "<?php echo $r[0];?>" href = "<?php echo OCP\Util::linkTo('reader', 'index.php').'?dir='.$current_dir.$r[0].'/';?>"> <center> <span class = "nametext"> <?php echo htmlspecialchars($r[0]);?> |