diff options
| author | Michael Tänzer <neo@nhng.de> | 2012-01-10 13:32:37 +0100 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2012-01-10 13:32:37 +0100 |
| commit | 923efbdb9d77f2976d2eb6584a1bb922c0cfaf90 (patch) | |
| tree | ef816048edfdf64d07d33e4e5d55653db8ebdb00 /pages/wot | |
| parent | ffeed4b555aa9c0088c43d1dbfbd810d3b177c01 (diff) | |
| parent | 22fb084237713f5041def5161a2df884b1b24f74 (diff) | |
| download | cacert-devel-923efbdb9d77f2976d2eb6584a1bb922c0cfaf90.tar.gz cacert-devel-923efbdb9d77f2976d2eb6584a1bb922c0cfaf90.tar.xz cacert-devel-923efbdb9d77f2976d2eb6584a1bb922c0cfaf90.zip | |
Merge branch 'release' into bug-985bug-985
Conflicts:
www/wot.php
Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'pages/wot')
| -rw-r--r-- | pages/wot/5.php | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pages/wot/5.php b/pages/wot/5.php index 8b56fa5..c1a6438 100644 --- a/pages/wot/5.php +++ b/pages/wot/5.php @@ -21,16 +21,10 @@ <? if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") { - if(array_key_exists('reminderset',$_SESSION['_config']) && $_SESSION['_config']['remindersent'] == 1) - { - ?><font color="orange" size="+1"><? - } - else - { - ?><font color="orange" size="+1"><?=_("ERROR")?>: <? - } - echo $_SESSION['_config']['error']."</font>"; - unset($_SESSION['_config']['error']); + ?><font color="orange" size="+1"> + <? echo _("ERROR").": ".$_SESSION['_config']['error'] ?> + </font> + <?unset($_SESSION['_config']['error']); } ?> <? if(array_key_exists('noemailfound',$_SESSION['_config']) && $_SESSION['_config']['noemailfound'] == 1) { ?> |