From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Wed, 13 Jun 2012 19:17:46 +0000 (-0400)
Subject: Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into... 
X-Git-Tag: v4.5.0beta1~74^2~398^2~32^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b5889d6ffe2a91ccb223a84a220cb1580bc42929;p=nextcloud-server.git

Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127

Conflicts:
	apps/files_external/templates/settings.php
	lib/template.php
---

b5889d6ffe2a91ccb223a84a220cb1580bc42929
diff --cc lib/template.php
index 9ce041a71c3,ba82b21774a..a3700e133e7
--- a/lib/template.php
+++ b/lib/template.php
@@@ -357,12 -373,11 +376,12 @@@ class OC_Template
  			// Decide which page we show
  			if( $this->renderas == "user" ){
  				$page = new OC_Template( "core", "layout.user" );
- 				$page->assign('searchurl',OC_Helper::linkTo( 'search', 'index.php' ));
+ 				$page->assign('searchurl',OC_Helper::linkTo( 'search', 'index.php' ), false);
 +				$page->assign('requesttoken', $this->vars['requesttoken']);
  				if(array_search(OC_APP::getCurrentApp(),array('settings','admin','help'))!==false){
- 					$page->assign('bodyid','body-settings');
+ 					$page->assign('bodyid','body-settings', false);
  				}else{
- 					$page->assign('bodyid','body-user');
+ 					$page->assign('bodyid','body-user', false);
  				}
  
  				// Add navigation entry