Skip to content
Browse files

Merge branch 'master' of github.com:WoltLab/WCF

  • Loading branch information...
2 parents af31913 + ebf89e5 commit 0fa279da0502eaa449af443162c2edce70544eb0 @BurntimeX BurntimeX committed Feb 27, 2012
View
2 wcfsetup/install/files/acp/style/wcf.css
@@ -3923,14 +3923,14 @@ button:hover {
/* Active State */
.wcf-button:focus,
-.active .wcf-button,
.default .wcf-button:focus,
input[type='reset']:focus,
input[type='submit']:focus,
input[type='button']:focus,
button:focus,
.wcf-button:active,
+.active .wcf-button,
.default .wcf-button:active,
input[type='reset']:active,
input[type='submit']:active,
View
30 wcfsetup/install/files/icon/bookmark1.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--<?xml-stylesheet type="text/css" href="svg.css"?>-->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" xml:space="preserve">
+
+ <title>Bookmark</title>
+ <desc>Bookmark Icon</desc>
+
+ <!--
+ @author Harald Szekely
+ @copyright 2011 WoltLab GmbH
+ @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ -->
+
+ <defs>
+ <style type="text/css">
+ <![CDATA[
+ .Upper1 {fill: #666;}
+ .Lower1 {fill: #fff;}
+ ]]>
+ </style>
+ </defs>
+
+ <g id="IconBookmark">
+ <path class="Lower1" style="fill-rule: evenodd; clip-rule: evenodd;" d="M11,2H2c0,0,3,0,3,2v11l4-5l4,5V4.0205078
+ C13,3,12,2,11,2z"/>
+ <path class="Upper1" style="fill-rule: evenodd; clip-rule: evenodd;" d="M11,1H2c0,0,3,0,3,2v11l4-5l4,5V3.0205078
+ C13,2,12,1,11,1z"/>
+ </g>
+</svg>
View
2 wcfsetup/install/files/js/WCF.js
@@ -2872,7 +2872,7 @@ WCF.Effect.SmoothScroll.prototype = {
* Initializes effect.
*/
init: function() {
- $('a[href=#top],a[href=#bottom]').click(function() {
+ $('a[href$=#top],a[href$=#bottom]').click(function() {
var $target = $(this.hash);
if ($target.length) {
var $targetOffset = $target.getOffsets().top;
View
22 wcfsetup/install/files/lib/system/io/Tar.class.php
@@ -269,15 +269,31 @@ protected function readContent() {
$i = 0;
// Read the 512 bytes header
+ $longFilename = null;
while (strlen($binaryData = $this->file->read(512)) != 0) {
// read header
$header = $this->readHeader($binaryData);
if ($header === false) {
continue;
}
- $this->contentList[$i] = $header;
- $this->contentList[$i]['index'] = $i;
- $i++;
+
+ // fixes a bug that files with long names aren't correctly
+ // extracted
+ if ($longFilename !== null) {
+ $header['filename'] = $longFilename;
+ $longFilename = null;
+ }
+ if ($header['typeflag'] == 'L') {
+ $fileData = unpack("a".$header['size']."filename", $this->file->read(512));
+ $longFilename = $fileData['filename'];
+ $header['size'] = 0;
+ }
+ // don't include the @LongLink file in the content list
+ else {
+ $this->contentList[$i] = $header;
+ $this->contentList[$i]['index'] = $i;
+ $i++;
+ }
$this->file->seek($this->file->tell() + (512 * ceil(($header['size'] / 512))));
}

0 comments on commit 0fa279d

Please sign in to comment.
Something went wrong with that request. Please try again.