By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
[ticket/10550] Sort not installed styles list in the styles section of the ACP.
Conflicts:
phpBB/includes/acp/acp_styles.php
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
[ticket/10611] Filter out not existing database tables when making a backup.
[ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().
[ticket/10611] Generate db_tools instance in acp_database module.
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10611:
[ticket/10611] Filter out not existing database tables when making a backup.
[ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().
[ticket/10611] Generate db_tools instance in acp_database module.
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
[ticket/10162] Increase maximum length of email address TLD from 6 to 63.
[ticket/10162] Add test cases for top level domain names longer than 6 chars.
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10162:
[ticket/10162] Increase maximum length of email address TLD from 6 to 63.
[ticket/10162] Add test cases for top level domain names longer than 6 chars.
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
[ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.
[ticket/10751] Add sql_lower_text() to database abstraction layer.
Conflicts:
phpBB/includes/db/dbal.php
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10751:
[ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.
[ticket/10751] Add sql_lower_text() to database abstraction layer.
On MSSQL, LOWER() can only be called on bounded strings (i.e. varchar or char).
So, in order to use it on a text column, we have to convert it to an
appropriate type. We do so using the SUBSTRING function.
PHPBB3-10751
* develop-olympus:
[ticket/10908] Document that 0 filesize configuration means limited by PHP
[ticket/10908] Download files only up to max_upload_filesize if limit is 0
* naderman/ticket/10908:
[ticket/10908] Document that 0 filesize configuration means limited by PHP
[ticket/10908] Download files only up to max_upload_filesize if limit is 0
Using $this->db_tools->sql_list_tables() as the first argument gives us table
names as array keys as a by-product which might be useful at some point.
PHPBB3-10611
By Dhruv Goel
via Dhruv Goel
* github-dhruv/ticket/10308:
[ticket/10308] fixes indentation
[ticket/10308] fixes language variable name
[ticket/10308] makes variable boolean
[ticket/10308] fixes sql query, limit it to 1
[ticket/10308] fixes user deletion if no posts
[ticket/10308] renames language key to USER_NO_POSTS_DELETE
[ticket/10308] fix language and user's total posts
[ticket/10308] fixes language entity.
[ticket/10308] Displays message to user if there are no posts.
[ticket/10308] disable retain/ delete posts option when deleting a user
By Dhruv Goel
via Dhruv Goel
* github-dhruv/ticket/10308:
[ticket/10308] fixes indentation
[ticket/10308] fixes language variable name
[ticket/10308] makes variable boolean
[ticket/10308] fixes sql query, limit it to 1
[ticket/10308] fixes user deletion if no posts
[ticket/10308] renames language key to USER_NO_POSTS_DELETE
[ticket/10308] fix language and user's total posts
[ticket/10308] fixes language entity.
[ticket/10308] Displays message to user if there are no posts.
[ticket/10308] disable retain/ delete posts option when deleting a user
* rahulr92/ticket/10650:
[ticket/10650] Subject is cleared if no permissions exist
[ticket/10650] Changed apostrophe to utf8 single quote
[ticket/10650] Moving censoring to before truncation
[ticket/10650] Added apostrophe in explanation in language file
[ticket/10650] Inserted correct utf ELLIPSIS character
[ticket/10650] Added space after if and comment
[ticket/10650] Added ellipsis to language file
[ticket/10650] Added href title to subject link
[ticket/10650] Made use of truncate_string() function
[ticket/10650] Removed changes from acp_forums.php
[ticket/10650]Removed incorrect newline
[ticket/10650] Changed acp option from per forum to global
[ticket/10650] Added checking for empty subjects
[ticket/10650] Corrected intendation
[ticket/10650]Added permission checking and utf8 functions
[ticket/10650] Cropped subject and inserted newline
[ticket/10650] Corrected space before true
[ticket/10650] Changed language files and forumlist
[ticket/10650] Added static sql files
[ticket/10650] Displaying last topic on forum list
Conflicts:
phpBB/install/database_update.php
phpBB/language/en/common.php
* develop-olympus:
[ticket/10565] Add line breaks to query in order to follow coding guidelines.
[ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clause
* bantu/ticket/10565:
[ticket/10565] Add line breaks to query in order to follow coding guidelines.
[ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clause
The type of $user->data['user_id'] is (almost) guranteed to be integer
since session::session_create() casts it to integer.
The type of $row['user_id'] is only an integer if the DB driver adjusts the
PHP type according to the DB type. This is only done by some of our
not-so-popular DB drivers and is not the case for MySQL.
As such this comparison is (almost) never true and a PM is also sent to the
author itself when it is sent to a group the author is also a member of.
Since this behaviour seems to have been accepted by the communty, the dead
code is removed and current behaviour is kept.
Also, checking this in the loop seems to be a rather bad idea.
Introduced by 78b1c4caaa.
PHPBB3-10790
* develop-olympus:
[ticket/10605] Use database updater function _sql() instead of $db->sql_query()
[ticket/10605] Put end of array on its own line because start of array is too.
[ticket/10605] Add parameter documentation to phpbb_delete_user_pms
[ticket/10605] Fix left join usage.
[ticket/10605] Add a section for updating from 3.0.10 to schema updates.
[ticket/10605] Fix syntax error in database updater.
[ticket/10605] Reset user´s pm count to 0 when deleting his PMs
[ticket/10605] Split query to be able to use indexes
[ticket/10605] Rename $delete_rows to $delete_ids.
[ticket/10605] Break long comment into multiple lines 80 chars short.
[ticket/10605] Remove unnecessary $delete_ids array.
[ticket/10605] Remove unnecessary array_keys calls on $delete_rows.
[ticket/10605] Remove unused variable declarations.
[ticket/10605] Turn $undelivered_user into a real array of counters.
[ticket/10605] Use unset() instead of checking user_id over and over again.
[ticket/10605] Prefix function with phpbb_ and use true instead of 1
[ticket/10605] Delete orphan private messages on update
[ticket/10605] Check for orphan privmsgs when deleting a user
* ticket/10605:
[ticket/10605] Use database updater function _sql() instead of $db->sql_query()
[ticket/10605] Put end of array on its own line because start of array is too.
[ticket/10605] Add parameter documentation to phpbb_delete_user_pms
[ticket/10605] Fix left join usage.
[ticket/10605] Add a section for updating from 3.0.10 to schema updates.
[ticket/10605] Fix syntax error in database updater.
[ticket/10605] Reset user´s pm count to 0 when deleting his PMs
[ticket/10605] Split query to be able to use indexes
[ticket/10605] Rename $delete_rows to $delete_ids.
[ticket/10605] Break long comment into multiple lines 80 chars short.
[ticket/10605] Remove unnecessary $delete_ids array.
[ticket/10605] Remove unnecessary array_keys calls on $delete_rows.
[ticket/10605] Remove unused variable declarations.
[ticket/10605] Turn $undelivered_user into a real array of counters.
[ticket/10605] Use unset() instead of checking user_id over and over again.
[ticket/10605] Prefix function with phpbb_ and use true instead of 1
[ticket/10605] Delete orphan private messages on update
[ticket/10605] Check for orphan privmsgs when deleting a user
Conflicts:
phpBB/install/database_update.php
