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

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

diff --cc apps/files_external/templates/settings.php
Simple merge

diff --cc lib/template.php
index 9ce041a71c3d5e61742cc8136ddca6871d9905e4,ba82b21774a1a6dcd96e3a3f5352ff7dd36d497a..a3700e133e79786ecab01400d1ed432488b90350
--- 1/lib/template.php
--- 2/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