[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.3+dfsg-1-10-gf51915d

[David Prévot]

The following commit has been merged in the master branch:
commit f85f7f50db2fb800b52bbd30cd572e3267f2f7cb
Author: David Prévot <taffit at debian.org>
Date:   Wed Apr 10 09:53:00 2013 -0400

    Refresh patches

diff --git a/debian/patches/01_fix_data_path.diff b/debian/patches/01_fix_data_path.diff
index 95f602e..ed30596 100644
--- a/debian/patches/01_fix_data_path.diff
+++ b/debian/patches/01_fix_data_path.diff
@@ -8,7 +8,7 @@ Author: Thomas Mueller <thomas.mueller at tmit.eu>
 Bug-Debian: http://bugs.debian.org/648674
 Forwarded: not-needed
 Reviewed-by: David Prévot <taffit at debian.org>
-Last-Update: 2013-04-01
+Last-Update: 2013-04-10
 --- a/lib/config.php
 +++ b/lib/config.php
 @@ -130,12 +130,12 @@
@@ -210,7 +210,7 @@ Last-Update: 2013-04-01
 -$datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data');
 +$datadir = OC_Config::getValue('datadirectory', '/var/lib/owncloud/data');
  $vulnerableToNullByte = false;
- if(file_exists(__FILE__."\0Nullbyte")) { // Check if the used PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)
+ if(@file_exists(__FILE__."\0Nullbyte")) { // Check if the used PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)
  	$vulnerableToNullByte = true;
 --- a/cron.php
 +++ b/cron.php
diff --git a/debian/patches/fix_displayed_version.diff b/debian/patches/fix_displayed_version.diff
index 8adcfc3..7e9ac35 100644
--- a/debian/patches/fix_displayed_version.diff
+++ b/debian/patches/fix_displayed_version.diff
@@ -1,11 +1,10 @@
 Description: Fix displayed version
- Since the update shall be done via a package manager, checking if a
- new version in the administration is useless, thus checking disabled
- by default, and displayed version fixed to make it clear that’s a
- Debian package.
+ Since the update shall be done via a package manager, checking for
+ a new version is useless, thus checking disabled by default, and
+ displayed version fixed to make it clear that’s a Debian package.
 Author: David Prévot <taffit at debian.org>
 Forwarded: not-needed
-Last-Update: 2013-04-02
+Last-Update: 2013-04-10
 --- a/lib/updater.php
 +++ b/lib/updater.php
 @@ -71,7 +71,7 @@
@@ -25,7 +24,7 @@ Last-Update: 2013-04-02
  	<legend><strong><?php p($l->t('Version'));?></strong></legend>
 -	<strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?> <?php p(OC_Util::getEditionString()); ?>
 +	<strong>ownCloud</strong> @VERSION@ <?php p(OC_Util::getEditionString()); ?>
- 	(<?php p(OC_Updater::ShowUpdatingHint()); ?>)<br/>
+ 	(<?php print_unescaped(OC_Updater::ShowUpdatingHint()); ?>)<br/>
  	<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
  </fieldset>
 --- a/settings/templates/personal.php

-- 
owncloud.git