diff options
author | Robin Appelman <icewind@owncloud.com> | 2012-10-11 22:54:39 +0200 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2012-10-11 22:54:39 +0200 |
commit | fb2d2bc2011c371ff1e4334f84494f15a84a07a2 (patch) | |
tree | b5c20c842441ce4288038909daa5a158c8e74e80 /lib/templatelayout.php | |
parent | 5c6e9518edde10e0c23d0d734d2cc6d161fc15c0 (diff) | |
parent | ee28e35ba93032a3d43601c030d3d44df9b092f0 (diff) | |
download | nextcloud-server-fb2d2bc2011c371ff1e4334f84494f15a84a07a2.tar.gz nextcloud-server-fb2d2bc2011c371ff1e4334f84494f15a84a07a2.zip |
merge master into filesystem
Diffstat (limited to 'lib/templatelayout.php')
-rw-r--r-- | lib/templatelayout.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/templatelayout.php b/lib/templatelayout.php index c898628bcdf..4f26775b48e 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -12,8 +12,7 @@ class OC_TemplateLayout extends OC_Template { if( $renderas == 'user' ) { parent::__construct( 'core', 'layout.user' ); - $this->assign('searchurl',OC_Helper::linkTo( 'search', 'index.php' ), false); - if(array_search(OC_APP::getCurrentApp(),array('settings','admin','help'))!==false) { + if(in_array(OC_APP::getCurrentApp(),array('settings','admin','help'))!==false) { $this->assign('bodyid','body-settings', false); }else{ $this->assign('bodyid','body-user', false); |