Merge pull request #14472 from felixn/stable15

rullzer · web-flow · commit 4ee9069b7ecf · 2019-03-04T12:19:34.000+01:00
Fix for issue #13319: load oc-backbone-webdav before loading versions app
diff --git a/apps/files_versions/lib/Hooks.php b/apps/files_versions/lib/Hooks.php
@@ -149,6 +149,7 @@ public static function pre_renameOrCopy_hook($params) {
 	 * Load additional scripts when the files app is visible
 	 */
 	public static function onLoadFilesAppScripts() {
+		\OCP\Util::addScript('oc-backbone-webdav');
 		\OCP\Util::addScript('files_versions', 'merged');
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ public static function pre_renameOrCopy_hook($params) {`
`149`	`149`	`* Load additional scripts when the files app is visible`
`150`	`150`	`*/`
`151`	`151`	`public static function onLoadFilesAppScripts() {`
	`152`	`+ \OCP\Util::addScript('oc-backbone-webdav');`
`152`	`153`	`\OCP\Util::addScript('files_versions', 'merged');`
`153`	`154`	`}`
`154`	`155`	`}`