Fix a warning and an error

diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php
index 0b0a4f1c265584e3db1daa60e45a230553c935b9..650bf29bbc99d3f6e5059db2483ea9c6256371a8 100644 (file)
--- a/apps/calendar/templates/settings.php
+++ b/apps/calendar/templates/settings.php
@@ -2,7 +2,9 @@
         <fieldset class="personalblock">
                 <label for="timezone"><strong><?php echo $l->t('Timezone');?></strong></label>
                <select id="timezone" name="timezone">
-                <?php foreach($_['timezones'] as $timezone):
+                <?php
+               $continent = '';
+               foreach($_['timezones'] as $timezone):
                        if ( preg_match( '/^(America|Antartica|Arctic|Asia|Atlantic|Europe|Indian|Pacific)\//', $timezone ) ):
                                $ex=explode('/', $timezone, 2);//obtain continent,city
                                if ($continent!=$ex[0]):

diff --git a/apps/user_openid/appinfo/app.php b/apps/user_openid/appinfo/app.php
index 886265cd312eeff0997ed67cfde50c06c6ba9a63..e8e9fd2296b5ad7ce54b1a617e2bf39895e63f46 100644 (file)
--- a/apps/user_openid/appinfo/app.php
+++ b/apps/user_openid/appinfo/app.php
@@ -15,7 +15,7 @@ if(strpos($_SERVER["REQUEST_URI"],'?') and !strpos($_SERVER["REQUEST_URI"],'='))
 }
 
 OC_Util::addHeader('link',array('rel'=>'openid.server', 'href'=>OC_Helper::linkTo( "user_openid", "user.php", null, true ).'/'.$userName));
-OC_Util::addHeader('link',array('rel'=>'openid.delegate', 'href'=>$OC_Helper::linkTo( "user_openid", "user.php", null, true ).'/'.$userName));
+OC_Util::addHeader('link',array('rel'=>'openid.delegate', 'href'=>OC_Helper::linkTo( "user_openid", "user.php", null, true ).'/'.$userName));
 
 OC_APP::registerPersonal('user_openid','settings');