may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
Nejc Kovač 2022-06-14 09:54:15 +02:00
commit dbeff3217d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/SurveyAdminSettings.php
View File

@ -4619,7 +4619,9 @@ class SurveyAdminSettings {
if ($dataFileStatus== FILE_STATUS_NO_DATA if ($dataFileStatus== FILE_STATUS_NO_DATA
|| $dataFileStatus == FILE_STATUS_NO_FILE || $dataFileStatus == FILE_STATUS_NO_FILE
|| $dataFileStatus == FILE_STATUS_SRV_DELETED){ || $dataFileStatus == FILE_STATUS_SRV_DELETED){
echo '<fieldset><legend>'.$lang['srv_no_data'].'</legend>';
Common::noDataAlert(); Common::noDataAlert();
echo '</fieldset>';
return false; return false;
} }
if ($_GET['m'] == 'excel') { if ($_GET['m'] == 'excel') {

1
frontend/simple/classes/DisplayController.php
View File

@ -656,7 +656,6 @@ class DisplayController{
echo ' <input name="submit" value="'.$lang['next1'].'" class="regfield" type="submit">'; echo ' <input name="submit" value="'.$lang['next1'].'" class="regfield" type="submit">';
echo '</form>'; echo '</form>';
echo 'hello there';
} }