prepare for next release

shi-yang · Jan 22, 2017 · f632553 · f632553
1 parent 4d0bfbe
commit f632553
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/backend/views/site/index.php b/backend/views/site/index.php
@@ -115,7 +115,7 @@
                     <tbody>
                         <tr>
                             <td>iiSNS version</td>
-                            <td><?= Yii::$app->setting->get('version') ?></td>
+                            <td><?= Yii::$app->setting->getVersion() ?></td>
                         </tr>
                         <tr>
                             <td>The operating system</td>

diff --git a/common/components/Setting.php b/common/components/Setting.php
@@ -113,4 +113,13 @@ public function getData()
         $settings = Yii::$app->db->createCommand("SELECT * FROM {{%setting}}")->queryAll();
         return \yii\helpers\ArrayHelper::map($settings, 'key', 'value');
     }
+
+    /**
+     * Returns a string representing the current version of the iisns.
+     * @return string the version of iisns
+     */
+    public static function getVersion()
+    {
+        return '0.6.0';
+    }
 }
diff --git a/frontend/themes/basic/site/index.php b/frontend/themes/basic/site/index.php
@@ -217,12 +217,12 @@
             <h1><?= Yii::t('app', 'Everyone is an artist') ?></h1>
             <p class="lead">I hope you like it.</p>
             <p>
-              <a class="btn btn-lg btn-success" href="https://github.com/shi-yang/iisns/archive/v<?= Yii::$app->setting->get('version') ?>.zip">
+              <a class="btn btn-lg btn-success" href="https://github.com/shi-yang/iisns/archive/v<?= Yii::$app->setting->getVersion() ?>.zip">
                 <span class="glyphicon glyphicon-download-alt"></span> <?= Yii::t('app', 'Download Source') ?>
               </a>
             </p>
             <p id="version">
-              Version <?= Yii::$app->setting->get('version') ?> Alpha &nbsp;&nbsp;·&nbsp;&nbsp;
+              Version <?= Yii::$app->setting->getVersion() ?> Alpha &nbsp;&nbsp;·&nbsp;&nbsp;
               <a href="https://github.com/shi-yang/iisns" target="_blank">
                 GitHub Project</a> &nbsp;&nbsp;·&nbsp;&nbsp;
               Created by <a href="http://www.iisns.com/shiyang" target="_blank">Shiyang</a>
@@ -307,7 +307,6 @@
     <!-- /END THE FEATURETTES -->
     </div><!-- /.container -->
 
-
 </div>
 <footer class="footer">
     <div class="container">

diff --git a/install/index.php b/install/index.php
@@ -20,7 +20,6 @@
 use yii\base\Security;
 
 $sqlFile = 'data.sql';
-$iisnsVersion = '2.1.3';
 
 header('Content-Type: text/html; charset=utf-8');
 $PHP_SELF = addslashes(htmlspecialchars($_SERVER['PHP_SELF'] ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_NAME']));
@@ -265,7 +264,6 @@ function writable($var)
                         ('siteName', '{$siteName}'),
                         ('siteTitle', '{$siteTitle}'),
                         ('siteDescription', '{$siteDescription}'),
-                        ('version', '" . $iisnsVersion . "');
                     ")->execute();
                     $db->createCommand("
                         INSERT INTO `pre_user_data` (`user_id`) VALUES