mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of gitorious.org:owncloud/owncloud

This commit is contained in:
Bjoern Schiessle 2012-06-14 13:44:42 +02:00
parent 211a546600 8fd9cbcc54
commit 87855f2506
3 changed files with 46 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/contacts/templates/part.cropphoto.php
View File

@ -1,7 +1,7 @@
<?php <?php
$id = $_['id']; $id = $_['id'];
$tmpkey = $_['tmpkey']; $tmpkey = $_['tmpkey'];
$csrf_token = $_GET['csrf_token']; $requesttoken = $_['requesttoken'];
OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmpkey: '.$tmpkey, OCP\Util::DEBUG); OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmpkey: '.$tmpkey, OCP\Util::DEBUG);
?> ?>
<script language="Javascript"> <script language="Javascript">
@ -49,7 +49,7 @@ OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmpkey: '.$tmpkey,
action="<?php echo OCP\Util::linkToAbsolute('contacts', 'ajax/savecrop.php'); ?>"> action="<?php echo OCP\Util::linkToAbsolute('contacts', 'ajax/savecrop.php'); ?>">
<input type="hidden" id="id" name="id" value="<?php echo $id; ?>" /> <input type="hidden" id="id" name="id" value="<?php echo $id; ?>" />
<input type="hidden" name="requesttoken" value="<?php echo $csrf_token; ?>"> <input type="hidden" name="requesttoken" value="<?php echo $requesttoken; ?>">
<input type="hidden" id="tmpkey" name="tmpkey" value="<?php echo $tmpkey; ?>" /> <input type="hidden" id="tmpkey" name="tmpkey" value="<?php echo $tmpkey; ?>" />
<fieldset id="coords"> <fieldset id="coords">
<input type="hidden" id="x1" name="x1" value="" /> <input type="hidden" id="x1" name="x1" value="" />

2
lib/helper.php
View File

@ -132,7 +132,7 @@ class OC_Helper {
* Returns a absolute url to the given service. * Returns a absolute url to the given service.
*/ */
public static function linkToRemote( $service, $add_slash = true ) { public static function linkToRemote( $service, $add_slash = true ) {
return self::linkToAbsolute( '', 'remote.php') . '/' . $service . ($add_slash?'/':''); return self::linkToAbsolute( '', 'remote.php') . '/' . $service . (($add_slash && $service[strlen($service)-1]!='/')?'/':'');
} }
/** /**

4
lib/public/util.php
View File

@ -264,10 +264,6 @@ class Util {
public static function callCheck(){ public static function callCheck(){
return(\OC_Util::callCheck()); return(\OC_Util::callCheck());
} }
} }
?> ?>