diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-15 11:48:26 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-15 11:48:26 +0200 |
| commit | 4767c705782786f1682ebef1c4d726ac3a4fb5f5 (patch) | |
| tree | 962a5f91a64b134c281f72975e1a1035b0cecc6a /3rdparty | |
| parent | 22a33b509ff8339393834764a19d8d026177783e (diff) | |
| parent | 2b228fba3463722ad19ea6ccd150b96772508791 (diff) | |
| download | nextcloud-server-4767c705782786f1682ebef1c4d726ac3a4fb5f5.tar.gz nextcloud-server-4767c705782786f1682ebef1c4d726ac3a4fb5f5.zip | |
fix merge conflicts
Diffstat (limited to '3rdparty')
| -rw-r--r-- | 3rdparty/mediawiki/CSSMin.php | 1 | ||||
| -rw-r--r-- | 3rdparty/phpass/PasswordHash.php | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/3rdparty/mediawiki/CSSMin.php b/3rdparty/mediawiki/CSSMin.php index 1ee2919140f..e9c2badf62b 100644 --- a/3rdparty/mediawiki/CSSMin.php +++ b/3rdparty/mediawiki/CSSMin.php @@ -172,7 +172,6 @@ class CSSMin { $type = self::getMimeType( $file ); // Detect when URLs were preceeded with embed tags, and also verify file size is // below the limit - var_dump($match['embed'], $file, filesize($file)); if ( $type && $match['embed'][1] > 0 diff --git a/3rdparty/phpass/PasswordHash.php b/3rdparty/phpass/PasswordHash.php index 12958c7f19e..84447b277df 100644 --- a/3rdparty/phpass/PasswordHash.php +++ b/3rdparty/phpass/PasswordHash.php @@ -48,7 +48,7 @@ class PasswordHash { function get_random_bytes($count) { $output = ''; - if (is_readable('/dev/urandom') && + if (@is_readable('/dev/urandom') && ($fh = @fopen('/dev/urandom', 'rb'))) { $output = fread($fh, $count); fclose($fh); |