Merge remote-tracking branch 'origin/master' into cint

Conflicts: application/config/version.php
LimeSurvey · Aug 23, 2016 · f1641cb · f1641cb
2 parents 676cdb4 + 01f8b38
commit f1641cb
Show file tree

Hide file tree

Showing 21 changed files with 399 additions and 336 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -12,7 +12,7 @@
  *150413
  */
 
-$config['versionnumber'] = "2.50+";
+$config['versionnumber'] = "2.50";
 $config['dbversionnumber'] = 261;
 $config['buildnumber'] = '';
 $config['updatable'] = true;

diff --git a/application/controllers/AdminController.php b/application/controllers/AdminController.php
@@ -339,7 +339,7 @@ public function _getAdminFooter($url, $explanation, $return = false)
 
         $aData['buildtext'] = "";
         if(Yii::app()->getConfig("buildnumber")!="") {
-            $aData['buildtext']= "Build ".Yii::app()->getConfig("buildnumber");
+            $aData['buildtext']= "+".Yii::app()->getConfig("buildnumber");
         }
 
         //If user is not logged in, don't print the version number information in the footer.

diff --git a/application/extensions/AdminFooter/AdminFooter.php b/application/extensions/AdminFooter/AdminFooter.php
@@ -30,16 +30,16 @@ public function run()
                 $versiontitle = gT('Version');
                 $buildtext = "";
                 if(Yii::app()->getConfig("buildnumber")!="") {
-                   $buildtext = "Build ".Yii::app()->getConfig("buildnumber");
-                }                
+                   $buildtext = "+".Yii::app()->getConfig("buildnumber");
+                }
             }
-            
+
             $aData = array(
                 'versionnumber' => $versionnumber,
                 'versiontitle'  => $versiontitle,
                 'buildtext'     => $buildtext
             );
-        
+
             $this->render('footer', $aData);
         }
 }
diff --git a/application/extensions/AdminFooter/views/footer.php b/application/extensions/AdminFooter/views/footer.php
@@ -5,5 +5,5 @@
     <div style='float:right;'>
         <a href='http://donate.limesurvey.org' target="_blank"><img alt='<?php eT("Support this project - Donate to "); ?>LimeSurvey' title='<?php eT("Support this project - Donate to "); ?>LimeSurvey!' src='<?php echo Yii::app()->getConfig('adminimageurl'); ?>donate.png'/></a>
     </div>
-    <div class='subtitle'><a class='subtitle' title='<?php eT("Visit our website!"); ?>' href='http://www.limesurvey.org' target='_blank'>LimeSurvey</a><br /><?php echo $versiontitle . " " . $versionnumber . " " . $buildtext; ?></div>
+    <div class='subtitle'><a class='subtitle' title='<?php eT("Visit our website!"); ?>' href='http://www.limesurvey.org' target='_blank'>LimeSurvey</a><br /><?php echo $versiontitle . " " . $versionnumber . $buildtext; ?></div>
 </div>
diff --git a/application/views/admin/super/footer.php b/application/views/admin/super/footer.php
@@ -25,7 +25,7 @@
 
             <!-- Lime survey website -->
             <div class="col-xs-6 col-md-4 col-lg-6 text-right">
-                <a  title='<?php eT("Visit our website!"); ?>' href='http://www.limesurvey.org' target='_blank'>LimeSurvey</a><br /><?php echo $versiontitle."  ".$versionnumber." ".$buildtext;?>
+                <a  title='<?php eT("Visit our website!"); ?>' href='http://www.limesurvey.org' target='_blank'>LimeSurvey</a><br /><?php echo $versiontitle."  ".$versionnumber.$buildtext;?>
             </div>
         </div>
     </div>