diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-30 19:40:19 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-30 19:40:19 -0400 |
| commit | 11d162751381963e0c8a86cf15c811cc99003654 (patch) | |
| tree | 276b5b1e67a66491ef553346087b2959f35b3bc7 /apps/files_sharing/list.php | |
| parent | d13ba0ee2d93080ba56776442b9d39a53e2b6321 (diff) | |
| parent | d6faa89ed720da7319923cba33a83d0210216d57 (diff) | |
| download | nextcloud-server-11d162751381963e0c8a86cf15c811cc99003654.tar.gz nextcloud-server-11d162751381963e0c8a86cf15c811cc99003654.zip | |
Merge branch 'master' into sharing. Integrate with changes in master, rename classes
Conflicts:
lib/base.php
Diffstat (limited to 'apps/files_sharing/list.php')
| -rw-r--r-- | apps/files_sharing/list.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php index 6c27899369d..0a11f438eb7 100644 --- a/apps/files_sharing/list.php +++ b/apps/files_sharing/list.php @@ -22,19 +22,18 @@ require_once('../../lib/base.php'); require_once('lib_share.php'); -require('template.php'); -if (!OC_USER::isLoggedIn()){ +if (!OC_User::isLoggedIn()){ header( "Location: ".OC_HELPER::linkTo( "index.php" )); exit(); } -OC_APP::setActiveNavigationEntry("files_sharing_list"); +OC_App::setActiveNavigationEntry("files_sharing_list"); -OC_UTIL::addScript("files_sharing", "list"); +OC_Util::addScript("files_sharing", "list"); -$tmpl = new OC_TEMPLATE("files_sharing", "list", "user"); -$tmpl->assign("shared_items", OC_SHARE::getMySharedItems()); +$tmpl = new OC_Template("files_sharing", "list", "user"); +$tmpl->assign("shared_items", OC_Share::getMySharedItems()); $tmpl->printPage(); ?>
\ No newline at end of file |