Always change column name

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index ffcbdd43c3e0b2921747c7845a4fb8544c70fa6e..a849c94cac0f528192606c7efd20e2c519dec6c6 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -42,7 +42,7 @@
 ./inc/extensions/ext-yoomedia.php:121:         // @TODO Can this be moved into a database table?
 ./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y');
 ./inc/extensions-functions.php:155:    // @TODO Do we still need this? setExtensionUpdateNotes('');
 ./inc/extensions/ext-yoomedia.php:121:         // @TODO Can this be moved into a database table?
 ./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready! setExtensionDeprecated('Y');
 ./inc/extensions-functions.php:155:    // @TODO Do we still need this? setExtensionUpdateNotes('');

-./inc/extensions-functions.php:1939:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'
+./inc/extensions-functions.php:1933:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable'

 ./inc/extensions-functions.php:437:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 ./inc/extensions-functions.php:567:            // @TODO Extension is loaded, what next?
 ./inc/filter/bonus_filter.php:55:              // @TODO This query isn't right, it will only update if the user was for a longer time away!
 ./inc/extensions-functions.php:437:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) )
 ./inc/extensions-functions.php:567:            // @TODO Extension is loaded, what next?
 ./inc/filter/bonus_filter.php:55:              // @TODO This query isn't right, it will only update if the user was for a longer time away!

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 9228cf4f42c2b7fd99bd6040ac28d6f4a09e4cb2..9aca9cf4141a34308c0e1864be12ac31ec312c21 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -1924,14 +1924,8 @@ function addConfigDropSql ($columnName) {
 
 // Change configuration entry for actual extension
 function addConfigChangeSql ($oldColumnName, $newColumnName, $columnSql) {
 
 // Change configuration entry for actual extension
 function addConfigChangeSql ($oldColumnName, $newColumnName, $columnSql) {

-       // Is the old column there?
-       if (isSqlTableColumnFound('{?_MYSQL_PREFIX?}_config', $oldColumnName)) {
-               // Found so add it
-               addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_config` CHANGE `' . $oldColumnName . '` `' . $newColumnName . '` ' . $columnSql);
-       } else {
-               // Add debug line, debug_report_bug() would cause some extenion updates fail
-               logDebugMessage(__FUNCTION__, __LINE__, 'Configuration entry ' . $oldColumnName . ' not found.');
-       }
+       // Add the SQL statement
+       addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_config` CHANGE `' . $oldColumnName . '` `' . $newColumnName . '` ' . $columnSql);

 }
 
 // Enables/disables productive mode for current extension (used only while
 }
 
 // Enables/disables productive mode for current extension (used only while

diff --git a/templates/de/html/admin/admin_config_beg.tpl b/templates/de/html/admin/admin_config_beg.tpl
index 9ce7524fa97b9b530e47cfaa91029c22437430a3..d7957cad00cf5faf0612553dc5b4325e620c4fbc 100644 (file)
--- a/templates/de/html/admin/admin_config_beg.tpl
+++ b/templates/de/html/admin/admin_config_beg.tpl
@@ -11,7 +11,7 @@
                        {--ADMIN_BEG_POINTS--}:
                </td>
                <td width="295" align="center">
                        {--ADMIN_BEG_POINTS--}:
                </td>
                <td width="295" align="center">

-                       <input type="text" class="form_field" name="beg_points" size="7" maxlength="10" value="$content[points]" />
+                       <input type="text" class="form_field" name="beg_points" size="7" maxlength="10" value="{?beg_points?}" />

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>


@@ -19,7 +19,7 @@
                        {--ADMIN_BEG_POINTS_MAX--}:
                </td>
                <td width="195" align="center">
                        {--ADMIN_BEG_POINTS_MAX--}:
                </td>
                <td width="195" align="center">

-                       <input type="text" class="form_field" name="beg_points_max" size="7" maxlength="10" value="$content[points_max]" />
+                       <input type="text" class="form_field" name="beg_points_max" size="7" maxlength="10" value="{?beg_points_max?}" />

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>


@@ -155,7 +155,7 @@
                        {--ADMIN_BEG_NOTIFY_BONUS--}
                </td>
                <td align="center">
                        {--ADMIN_BEG_NOTIFY_BONUS--}
                </td>
                <td align="center">

-                       <input type="text" class="form_field" name="beg_notify_bonus" size="3" maxlength="7" value="$content[notify_bonus]" />
+                       <input type="text" class="form_field" name="beg_notify_bonus" size="3" maxlength="7" value="{?beg_notify_bonus?}" />

                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>