From 392c181338f84b2e0e0fdfbd304b1ca9d8da077e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 27 Oct 2009 22:04:50 +0000 Subject: [PATCH 1/1] Fixes for typos and cache problems --- inc/classes/cachesystem.class.php | 3 +++ inc/extensions-functions.php | 2 +- inc/extensions/ext-mediadata.php | 8 ++++---- inc/extensions/ext-rallye.php | 2 +- inc/functions.php | 1 + inc/modules/admin/overview-inc.php | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php index ad755f5dc5..69ce20fef1 100644 --- 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 1d9027656f..19d364c06b 100644 --- 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 1fd8d999e4..3526ceeb7d 100644 --- 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 2042216856..d63be45392 100644 --- a/inc/extensions/ext-rallye.php +++ b/inc/extensions/ext-rallye.php @@ -341,7 +341,7 @@ Zudem sollten Sie mindestens folgende Templates (in 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 60efa3138e..4c5ca96fa5 100644 --- 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 0870dccdc8..97679cc87b 100644 --- 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."
"); // Update extension if extension is installed and outdated - //* DEBUG: */ outputHtml("ext={$ext_name},ver={getThisExtensionVersion()}/".getExtensionVersion($ext_name)."
"); + //* DEBUG: */ outputHtml('ext=' . $ext_name . ',ver=' . getThisExtensionVersion() . '/' . getExtensionVersion($ext_name)."
"); if (getThisExtensionVersion() > $ext_ver) { // Update the extension updateExtension($ext_name, $ext_ver); -- 2.30.2