diff options
| -rw-r--r-- | apps/calendar/templates/settings.php | 4 | ||||
| -rw-r--r-- | apps/user_openid/appinfo/app.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php index 0b0a4f1c265..650bf29bbc9 100644 --- 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 886265cd312..e8e9fd2296b 100644 --- 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'); |