Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Errors #686

Merged
merged 7 commits into from Jul 18, 2013
Merged

Errors #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
15f7828
Syntax errors in SQL
enyst Jul 16, 2013
1249881
Add text for fetch mail from IMAP scheduled task
enyst Jul 16, 2013
f734d48
Tasks titles with capitals
enyst Jul 16, 2013
043d752
Typo
enyst Jul 16, 2013
629a5ad
PostgreSQL doesn't have MyISAM tables
enyst Jul 17, 2013
f47e2ed
Fatal error on include file.
enyst Jul 18, 2013
64bfd2c
Fix error undefined function.
enyst Jul 18, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions install/upgrade_elk_1-0_mysql.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}postby_emails_error (
email_from varchar(50) NOT NULL default '',
message_type char(10) NOT NULL default '',
message mediumtext NOT NULL default '',
PRIMARY KEY (id_email),
PRIMARY KEY (id_email)
) ENGINE=MyISAM{$db_collation};
---#

Expand All @@ -493,7 +493,7 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}postby_emails_filters (
filter_to varchar(255) NOT NULL default '',
filter_from varchar(255) NOT NULL default '',
filter_name varchar(255) NOT NULL default '',
PRIMARY KEY (id_filter),
PRIMARY KEY (id_filter)
) ENGINE=MyISAM{$db_collation};
---#

Expand Down Expand Up @@ -533,7 +533,7 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}log_likes (
CREATE TABLE IF NOT EXISTS {$db_prefix}message_likes (
id_member mediumint(8) unsigned NOT NULL default '0',
id_msg mediumint(8) unsigned NOT NULL default '0',
PRIMARY KEY (id_msg, id_member)
PRIMARY KEY (id_msg, id_member)
) ENGINE=MyISAM;
---#

Expand Down
12 changes: 6 additions & 6 deletions install/upgrade_elk_1-0_postgresql.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}antispam_questions (
language varchar(50) NOT NULL default '',
PRIMARY KEY (id_question),
KEY language (language(30))
) ENGINE=MyISAM;
);
---#

---# Move existing values...
Expand Down Expand Up @@ -606,7 +606,7 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}postby_emails (
time_sent int NOT NULL default '0',
email_to varchar(50) NOT NULL,
PRIMARY KEY (id_email)
) ENGINE=MyISAM{$db_collation};
);
---#

---# Creating postby_emails_error table
Expand All @@ -620,8 +620,8 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}postby_emails_error (
email_from varchar(50) NOT NULL default '',
message_type char(10) NOT NULL default '',
message mediumtext NOT NULL default '',
PRIMARY KEY (id_email),
) ENGINE=MyISAM{$db_collation};
PRIMARY KEY (id_email)
);
---#

---# Creating postby_emails_filters table
Expand All @@ -632,8 +632,8 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}postby_emails_filters (
filter_to varchar(255) NOT NULL default '',
filter_from varchar(255) NOT NULL default '',
filter_name varchar(255) NOT NULL default '',
PRIMARY KEY (id_filter),
) ENGINE=MyISAM{$db_collation};
PRIMARY KEY (id_filter)
);
---#

---# Adding new columns to log_activity...
Expand Down
2 changes: 1 addition & 1 deletion sources/admin/Packages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1485,7 +1485,7 @@ public function action_showoperations()

// Load the required file.
require_once(SUBSDIR . '/Package.subs.php');
require_once(SUBSDIR . 'Themes.subs.php');
require_once(SUBSDIR . '/Themes.subs.php');

// Uninstalling the mod?
$reverse = isset($_REQUEST['reverse']) ? true : false;
Expand Down
4 changes: 2 additions & 2 deletions sources/database/DbTable-mysql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ function db_create_table($table_name, $columns, $indexes = array(), $parameters
// Righty - let's do the damn thing!
$table_query = 'CREATE TABLE ' . $table_name . "\n" . '(';
foreach ($columns as $column)
$table_query .= "\n\t" . elk_db_create_query_column($column) . ',';
$table_query .= "\n\t" . $this->db_create_query_column($column) . ',';

// Loop through the indexes next...
foreach ($indexes as $index)
Expand Down Expand Up @@ -246,7 +246,7 @@ function db_add_column($table_name, $column_info, $parameters = array(), $if_exi
// Now add the thing!
$query = '
ALTER TABLE ' . $table_name . '
ADD ' . elk_db_create_query_column($column_info) . (empty($column_info['auto']) ? '' : ' primary key');
ADD ' . $this->db_create_query_column($column_info) . (empty($column_info['auto']) ? '' : ' primary key');

$db->query('', $query,
array(
Expand Down
16 changes: 8 additions & 8 deletions themes/default/languages/ManageScheduledTasks.english.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,16 @@
$txt['scheduled_task_desc_weekly_maintenance'] = 'Runs essential weekly maintenance on the forum - should not be disabled.';
$txt['scheduled_task_paid_subscriptions'] = 'Paid Subscription Checks';
$txt['scheduled_task_desc_paid_subscriptions'] = 'Sends out any necessary paid subscription reminders and removes expired member subscriptions.';
$txt['scheduled_task_remove_topic_redirect'] = 'Remove MOVED: redirection topics';
$txt['scheduled_task_remove_topic_redirect'] = 'Remove MOVED: Redirection Topics';
$txt['scheduled_task_desc_remove_topic_redirect'] = 'Deletes "MOVED:" topic notifications as specified when the moved notice was created.';
$txt['scheduled_task_remove_temp_attachments'] = 'Remove temporary attachment files';
$txt['scheduled_task_remove_temp_attachments'] = 'Remove Temporary Attachment Files';
$txt['scheduled_task_desc_remove_temp_attachments'] = 'Deletes temporary files created while attaching a file to a post that for any reason weren\'t renamed or deleted before.';
$txt['scheduled_task_remove_old_drafts'] = 'Remove Old Drafts';
$txt['scheduled_task_desc_remove_old_drafts'] = 'Deletes drafts older than the number of days defined in the draft settings in the admin panel.';
$txt['scheduled_task_remove_old_followups'] = 'Remove Old Follow-ups';
$txt['scheduled_task_desc_remove_old_followups'] = 'Deletes follow-up entries still present in the database, but pointing to non-existent topics.';
$txt['scheduled_task_maillist_fetch_IMAP'] = 'Fetch Emails from IMAP';
$txt['scheduled_task_desc_maillist_fetch_IMAP'] = 'Fetches emails for the mailing list feature from an IMAP box and processes them.';

$txt['scheduled_task_reg_starting'] = 'Starting at %1$s';
$txt['scheduled_task_reg_repeating'] = 'repeating every %1$d %2$s';
Expand All @@ -58,9 +64,3 @@
$txt['scheduled_log_time_taken_seconds'] = '%1$d seconds';
$txt['scheduled_log_empty_log'] = 'Clear Log';
$txt['scheduled_log_empty_log_confirm'] = 'Are you sure you want to completely clear the log?';

$txt['scheduled_task_remove_old_drafts'] = 'Remove old drafts';
$txt['scheduled_task_desc_remove_old_drafts'] = 'Deletes drafts older than the number of days defined in the draft settings in the admin panel.';

$txt['scheduled_task_remove_old_followups'] = 'Remove old follow-ups';
$txt['scheduled_task_desc_remove_old_followups'] = 'Deletes follow-up entries still present in the database, but pointing to non-existent topics.';
2 changes: 1 addition & 1 deletion themes/default/languages/ManageSettings.english.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@
$txt['core_settings_item_pe'] = 'Post by Email Management';
$txt['core_settings_item_pe_desc'] = 'This will allow users of your forum to reply to emailed notifications and personal messages and have them post directly as a reply to the appropriate thread or PM. This provides a familiar mailist feel. Use of this functionality will require additional setup steps on your hosting provider.';
$txt['core_settings_item_l'] = 'Likes';
$txt['core_settings_item_l_desc'] = 'Likes is a feature that allows members to like a post to show thier approval and popularity of the message content.';
$txt['core_settings_item_l_desc'] = 'Likes is a feature that allows members to like a post to show their approval and popularity of the message content.';
$txt['core_settings_item_pe'] = 'Post by Email Management';
$txt['core_settings_item_pe_desc'] = 'This will allow users of your forum to reply to emailed notifications and personal messages and have them post directly as a reply to the appropriate thread or PM. This provides a familiar mailist feel. Use of this functionality will require additional setup steps on your hosting provider.';
$txt['core_settings_item_ml'] = 'Moderation, Administration and User Logs';
Expand Down