[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.6-59-g60d76cc

[David Prévot]

The following commit has been merged in the master branch:
commit 60d76cc2b041086efa9d9c406d661d283b02bda4
Author: David Prévot <taffit at debian.org>
Date:   Sat Mar 30 22:40:18 2013 -0400

    Fix upgrade issue from 4.0.8

diff --git a/debian/changelog b/debian/changelog
index 1f9bc83..cdd9ea3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ owncloud (5.0.0+dfsg-1) UNRELEASED; urgency=low
     - Drop unneeded patches
     - 04_add_onfontresize.diff: Add missing jquery.onfontresize source
     - fix_mediawiki.diff: Adapt path to mediawi’s classes
+    - fix_upgrade.php: Fix upgrade issue from 4.0.8
   * debian/owncloud.links:
     - Link to Zend Framework instead of embedding a partial copy
     - Adapt to updated JQuery UI version
diff --git a/debian/patches/fix_upgrade.php b/debian/patches/fix_upgrade.php
new file mode 100644
index 0000000..c7d0a3b
--- /dev/null
+++ b/debian/patches/fix_upgrade.php
@@ -0,0 +1,25 @@
+Description: Fix upgrade issue from 4.0.8
+ The remote_core.css and remote_core.js configkey are not set in the
+ database on upgrade, so the layout (and probably more) is totally
+ messed up on upgrade from 4.0.8.
+Author: Bart Visscher <bartv at thisnet.nl>
+Origin: upstream, https://github.com/owncloud/core/commit/4260dce826cc0572371d5ab0d30ecf5f1ecb072a
+Bug: http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933
+Forwarded: todo
+Applied-Upstream: <version|URL|commit, identifies patches merged upstream, optional>
+Reviewed-by: David Prévot <taffit at debian.org>
+Last-Update: 2013-03-30
+--- a/lib/app.php
++++ b/lib/app.php
+@@ -79,6 +79,11 @@
+ 				OC_Util::$scripts = array();
+ 				OC_Util::$core_styles = OC_Util::$styles;
+ 				OC_Util::$styles = array();
++
++				if (!OC_AppConfig::getValue('core', 'remote_core.css', false)) {
++					OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
++					OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
++				}
+ 			}
+ 		}
+ 		// return
diff --git a/debian/patches/series b/debian/patches/series
index 151350b..19036fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 05_no_app_store.diff
 fix_tar_require.diff
 fix_mediawiki.diff
+fix_upgrade.php

-- 
owncloud.git