'Fixed' installation of depending extensions, other minor improvements

diff --git a/inc/extensions/ext-autopurge.php b/inc/extensions/ext-autopurge.php
index 46eb8354ac73d523dd8d9e211b2292e1d4976848..13f1c332a2b92f340f75cd270b0d4008baf93b0f 100644 (file)
--- a/inc/extensions/ext-autopurge.php
+++ b/inc/extensions/ext-autopurge.php
@@ -51,7 +51,7 @@ setExtensionAlwaysActive('Y');
 
 switch (getExtensionMode()) {
        case 'register': // Do stuff when installation is running
-               // Add dependency to 'bonus'
+               // Add dependency to ext-bonus
                addExtensionDependency('bonus');
 
                // SQL commands to run

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index ccb978024b8274addb8cdb38752c740c3197f1cc..027f3a2b6c52b6509fa0da8dcce644d1b5993e40 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -166,7 +166,7 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
                $OUT = $prefix . '<strong><a class="you_are_here" href="{%url=modules.php?module=' . $modCheck . '&amp;' . $type . '=' . $search . $linkAdd . '%}">' . getTitleFromMenu($accessLevel, $search, $type, $ADD) . '</a></strong>';
 
                // Can we close the you-are-here navigation?
-               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'type=' . $type . ',getWhat()=' . getWhat() . ',accessLevel=' . $accessLevel . ',isWhatSet()=' . intval(isWhatSet()));
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'type=' . $type . ',getWhat()=' . getWhat() . ',accessLevel=' . $accessLevel . ',isWhatSet()=' . intval(isWhatSet()));
                if (($type == 'what') || (($type == 'action') && ((!isWhatSet()) || (($accessLevel == 'admin') && (getWhat() == 'welcome'))))) {
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'type=' . $type);
                        // Add closing div and br-tag
@@ -1805,9 +1805,10 @@ function registerExtensionPointsData ($subject, $columnName, $lockedMode, $payme
        } // END - if
 
        // Is the 'subject' there?
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ifSqlTableExists(points_data)=' . ifSqlTableExists('points_data') . ',getExtensionMode()=' . getExtensionMode() . ',add=' . $add);
        if (((!ifSqlTableExists('points_data')) && ((getExtensionMode() == 'register') || (getExtensionMode() == 'update'))) || (countSumTotalData($subject, 'points_data', 'id', 'subject', true, $add) == 0)) {
                // Not found so:
-               if (isset($GLOBALS['previous_extension'][getCurrentExtensionName()])) {
+               if ((isset($GLOBALS['previous_extension'][getCurrentExtensionName()])) && (!ifSqlTableExists('points_data'))) {
                        $dummy = $GLOBALS['previous_extension'][getCurrentExtensionName()];
                        reportBug(__FUNCTION__, __LINE__, 'previous_extension[' . gettype($dummy) . ']=' . $dummy . ',getCurrentExtensionName()=' . getCurrentExtensionName() . ' - Under development, please report this!');
                } // END - if

diff --git a/templates/de/html/admin/admin_footer.tpl b/templates/de/html/admin/admin_footer.tpl
index b153ab1bbca687ede8f42dd470b9735b86de5ede..a3b18bcd88c6a84bc7c0960d9630a1150353c434 100644 (file)
--- a/templates/de/html/admin/admin_footer.tpl
+++ b/templates/de/html/admin/admin_footer.tpl
@@ -6,7 +6,7 @@
                <li class="menu_blur switch_sw2 bottom"><a href="http://bugs.mxchange.org" target="_blank" title="{--ADMIN_SUPPORT_BUGTRACKER_LINK--}">{--ADMIN_SUPPORT_BUGTRACKER_LINK--}</a></li>
                <li class="menu_blur switch_sw1 bottom"><a href="http://wiki.mxchange.org" target="_blank" title="{--ADMIN_SUPPORT_WIKI_LINK--}">{--ADMIN_SUPPORT_WIKI_LINK--}</a></li>
                <!-- <li class="menu_blur switch_sw2 bottom"><a href="http://cia.vc/stats/project/mxchange" target="_blank" title="{--ADMIN_SUPPORT_CIAVC_LINK--}">{--ADMIN_SUPPORT_CIAVC_LINK--}</a></li> //-->
-               <li class="menu_blur switch_sw1"><a href="http://stats.mxchange.org/branches/0.2.1-FINAL" target="_blank" title="{--ADMIN_SUPPORT_STATS_LINK--}">{--ADMIN_SUPPORT_STATS_LINK--}</a></li>
+               <li class="menu_blur switch_sw2"><a href="http://stats.mxchange.org/branches/0.2.1-FINAL" target="_blank" title="{--ADMIN_SUPPORT_STATS_LINK--}">{--ADMIN_SUPPORT_STATS_LINK--}</a></li>
        </ul>
        </div>
 </div>