Fixes for typos and cache problems

diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index ad755f5dc57b5acd5b14ec70063f61bfc8f76e14..69ce20fef1eecdde14c9a5d0180cdf00a2808831 100644 (file)
--- a/inc/classes/cachesystem.class.php
+++ b/inc/classes/cachesystem.class.php
@@ -231,6 +231,9 @@ class CacheSystem {
                        // Try to remove it
                        $this->removeCacheFile();
                }
+
+               // Always return an empty array if we have trouble or no data
+               return array();
        }
 
        // Destroy an existing cache file

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 1d9027656f76f07ea216801e24c0a75d484c4b62..19d364c06b6f76572347eefaa3cf8115d8370780 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -92,7 +92,7 @@ function loadExtension ($ext_name, $ext_mode = 'init', $ext_ver = '', $dry_run =
        // Do we have cache?
        if (isExtensionFunctionFileReadable($ext_name)) {
                // Not yet loaded?
-               if (($GLOBALS['cache_array']['extension']['ext_func'][$ext_name] == 'Y') && (!isset($GLOBALS['ext_loaded']['funcs'][$ext_name]))) {
+               if ((($GLOBALS['cache_array']['extension']['ext_func'][$ext_name] == 'Y') || (!isset($GLOBALS['cache_array']['extension']['ext_func'][$ext_name]))) && (!isset($GLOBALS['ext_loaded']['funcs'][$ext_name]))) {
                        // Construct FQFN for functions file
                        $funcsInclude = sprintf("inc/libs/%s_functions.php", $ext_name);
 

diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php
index 1fd8d999e41b7f6f8ca019ffd81ff8f7c340dbb7..3526ceeb7ddf81dbe1e2aae3f2dac7da05f66d79 100644 (file)
--- a/inc/extensions/ext-mediadata.php
+++ b/inc/extensions/ext-mediadata.php
@@ -56,8 +56,8 @@ switch (getExtensionMode()) {
                addExtensionSql('');
 
                // Add the filters
-               registerFilter('add_points', 'UPDATE_MEDIDADATA_ENTRY', false, true, getExtensionDryRun());
-               registerFilter('sub_points', 'UPDATE_MEDIDADATA_ENTRY', false, true, getExtensionDryRun());
+               registerFilter('add_points', 'UPDATE_MEDIADATA_ENTRY', false, true, getExtensionDryRun());
+               registerFilter('sub_points', 'UPDATE_MEDIADATA_ENTRY', false, true, getExtensionDryRun());
                break;
 
        case 'remove': // Do stuff when removing extension
@@ -67,8 +67,8 @@ switch (getExtensionMode()) {
                addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `what`='mediadata'");
 
                // Remove the filters
-               unregisterFilter('add_points', 'UPDATE_MEDIDADATA_ENTRY', false, true, getExtensionDryRun());
-               unregisterFilter('sub_points', 'UPDATE_MEDIDADATA_ENTRY', false, true, getExtensionDryRun());
+               unregisterFilter('add_points', 'UPDATE_MEDIADATA_ENTRY', false, true, getExtensionDryRun());
+               unregisterFilter('sub_points', 'UPDATE_MEDIADATA_ENTRY', false, true, getExtensionDryRun());
                break;
 
        case 'activate': // Do stuff when admin activates this extension

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index 20422168561cc646ca7f56e14074bdfff9272b8a..d63be45392a49ab428caac21a681df59fc3925e1 100644 (file)
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -341,7 +341,7 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
 
                        // Check for new started but not notified rallyes
                        $result = SQL_QUERY("SELECT SQL_SMALL_RESULT
-       `id`, `t`itle`, `start_time`, `end_time`, `send_notify`".$ADD1."
+       `id`, `title`, `start_time`, `end_time`, `send_notify`".$ADD1."
 FROM
        `{?_MYSQL_PREFIX?}_rallye_data`
 WHERE

diff --git a/inc/functions.php b/inc/functions.php
index 60efa3138edc088eca19193615a0e0b88586f5fa..4c5ca96fa50f0e41fc16d68381efe35fccb8dd1d 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -197,6 +197,7 @@ function addFatalMessage ($F, $L, $message, $extra='') {
        $GLOBALS['fatal_messages'][] = $message;
 
        // Log fatal messages away
+       debug_report_bug($message);
        logDebugMessage($F, $L, " message={$message}");
 }
 

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 0870dccdc8a1d0dad250a631799bc7ca5f902ef7..97679cc87bc51d8c332a4131d6cedc76529d2a68 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -87,7 +87,7 @@ function outputStandardOverview (&$result_tasks) {
                                //* DEBUG: */ outputHtml($ext_name."=".$ext_ver."<br />");
 
                                // Update extension if extension is installed and outdated
-                               //* DEBUG: */ outputHtml("ext={$ext_name},ver={getThisExtensionVersion()}/".getExtensionVersion($ext_name)."<br />");
+                               //* DEBUG: */ outputHtml('ext=' . $ext_name . ',ver=' . getThisExtensionVersion() . '/' . getExtensionVersion($ext_name)."<br />");
                                if (getThisExtensionVersion() > $ext_ver) {
                                        // Update the extension
                                        updateExtension($ext_name, $ext_ver);