summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@owncloud.com>2016-05-12 13:32:02 +0200
committerRoeland Jago Douma <rullzer@owncloud.com>2016-05-13 08:54:07 +0200
commiteb79b8383107c71f8def60d195de09a1152af263 (patch)
treeee20e1731f6202ebd720bfe3119392bc1ac15b09
parentcba4875e4dabc2f486bc776e3a5b4985d207fc90 (diff)
downloadnextcloud-server-eb79b8383107c71f8def60d195de09a1152af263.tar.gz
nextcloud-server-eb79b8383107c71f8def60d195de09a1152af263.zip
Move functions.php to legacy
This file should really be properly namespaced etc!
-rw-r--r--lib/private/legacy/template.php2
-rw-r--r--lib/private/legacy/template/functions.php (renamed from lib/private/template/functions.php)0
-rw-r--r--tests/lib/testcase.php2
3 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php
index 84b963e4ab6..73725529702 100644
--- a/lib/private/legacy/template.php
+++ b/lib/private/legacy/template.php
@@ -36,7 +36,7 @@
use OC\TemplateLayout;
-require_once __DIR__.'/../template/functions.php';
+require_once __DIR__.'/template/functions.php';
/**
* This class provides the templates for ownCloud.
diff --git a/lib/private/template/functions.php b/lib/private/legacy/template/functions.php
index a0540420e29..a0540420e29 100644
--- a/lib/private/template/functions.php
+++ b/lib/private/legacy/template/functions.php
diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php
index d7573337f87..7ed121d3556 100644
--- a/tests/lib/testcase.php
+++ b/tests/lib/testcase.php
@@ -423,7 +423,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
*/
protected function assertTemplate($expectedHtml, $template, $vars = []) {
- require_once __DIR__.'/../../lib/private/template/functions.php';
+ require_once __DIR__.'/../../lib/private/legacy/template/functions.php';
$requestToken = 12345;
$theme = new OC_Defaults();