Merge branch 'master' of https://git.1ka.si/git/1ka
This commit is contained in:
commit
dbeff3217d
@ -4619,7 +4619,9 @@ class SurveyAdminSettings {
|
||||
if ($dataFileStatus== FILE_STATUS_NO_DATA
|
||||
|| $dataFileStatus == FILE_STATUS_NO_FILE
|
||||
|| $dataFileStatus == FILE_STATUS_SRV_DELETED){
|
||||
echo '<fieldset><legend>'.$lang['srv_no_data'].'</legend>';
|
||||
Common::noDataAlert();
|
||||
echo '</fieldset>';
|
||||
return false;
|
||||
}
|
||||
if ($_GET['m'] == 'excel') {
|
||||
|
@ -656,7 +656,6 @@ class DisplayController{
|
||||
echo ' <input name="submit" value="'.$lang['next1'].'" class="regfield" type="submit">';
|
||||
|
||||
echo '</form>';
|
||||
echo 'hello there';
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user