Skip to content

Commit

Permalink
Dev Removed check for old template
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-schmitz
c-schmitz committed Jul 19, 2017
1 parent fd796d2 commit 9dc55e7
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions application/views/admin/survey/surveySummary_view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,13 @@
</div>
<?php endif;?>

<?php if(intval($templateapiversion) < intval(App()->getConfig("versionnumber")) ):?>
<?php /* Commented out for the moment because it is not properly working
if(intval($templateapiversion) < intval(App()->getConfig("versionnumber")) ):?>

This comment has been minimized.

Sign in to view

Copy link
@olleharstedt

olleharstedt Jul 19, 2017 •
edited

Collaborator

@Shnoulle Since we use semantic versioning, comparing ints like that will not work. You will have to use PHP's version_compare at least.

This comment has been minimized.

Sign in to view

Copy link
@Shnoulle

Shnoulle Jul 19, 2017

Collaborator

Currently : i'm sure we can not use 2.6 survey in 3.0: it working on november, surely not now.

And when i add version in config.xml : i think of API version : API version : we can use intval. Else we don't follow semver.

This comment has been minimized.

Sign in to view

Copy link
@Shnoulle

Shnoulle Jul 19, 2017

Collaborator

@olleharstedt

  1. see commit message : 3de1ed7
  2. See bug report : https://bugs.limesurvey.org/view.php?id=11808#c41839 (it really work for all question type in 2016-11-10)
  3. See http://semver.org/ «MAJOR version when you make incompatible API changes» : API is an integer

This comment has been minimized.

Sign in to view

Copy link
@olleharstedt

olleharstedt Jul 19, 2017 •
edited

Collaborator

Sure, templates are not backwards compatible.

Wait... Yes, you're right. intval is OK, but not floatval, my mistake.

This comment has been minimized.

Sign in to view

Copy link
@Shnoulle

Shnoulle Jul 19, 2017

Collaborator

http://semver.org/ i test API version …

This comment has been minimized.

Sign in to view

Copy link
@olleharstedt

olleharstedt Jul 19, 2017

Collaborator

Yes, see my edit. :)

This comment has been minimized.

Sign in to view

Copy link
@LouisGac

LouisGac Jul 19, 2017

Contributor

Hey: no stress. It will be part of the comfortUpdate so LimeSurvey partners will be alerted when they'll have to check/update one of their template files. So this part will be rewritten soon.

This comment has been minimized.

Sign in to view

Copy link
@Shnoulle

Shnoulle Jul 19, 2017

Collaborator

No stress for me (if we don't improve compatibility : and if template was not compatible : we must reset to the default one).
<div class="alert alert-warning alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span>&times;</span></button>
<strong><?php eT('This template is out of date.');?></strong> <?php eT('We can not guarantee optimum operation. It would be preferable to use a new template.');?>
</div>
<?php endif;?>
<?php endif; */ ?>
</div>
</div>

Expand Down

0 comments on commit 9dc55e7

Please sign in to comment.