aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'ticket/bantu/9655' into develop-olympusAndreas Fischer2010-06-201-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9655: [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.
| * | | | | [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.Andreas Fischer2010-06-141-2/+2
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-9655
* | | | | Merge branch 'ticket/bantu/9656' into develop-olympusAndreas Fischer2010-06-201-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9656: [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.
| * | | | | [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.Andreas Fischer2010-06-201-2/+2
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-9656
* | | | | Merge branch 'ticket/bantu/9643' into develop-olympusAndreas Fischer2010-06-201-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9643: [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.
| * | | | | [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.Andreas Fischer2010-06-081-1/+4
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-9643
* | | | | Merge branch 'ticket/bantu/9112' into develop-olympusAndreas Fischer2010-06-201-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9112: [ticket/9112] Make sure current user can see most active forum/topic.
| * | | | | [ticket/9112] Make sure current user can see most active forum/topic.Andreas Fischer2010-06-151-0/+7
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-9112
* | | | | Merge branch 'ticket/jellydoughnut/9132' into develop-olympusAndreas Fischer2010-06-171-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9132: [ticket/9132] Oracle CLOB support is broken, preventing storage of long strings
| * | | | | [ticket/9132] Oracle CLOB support is broken, preventing storage of long stringsJosh Woody2010-06-131-0/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This reverts Oracle support to the state it was in prior to phpBB 3.0.6. That is, storage of long strings works again (e.g. posts > 4 KB), but the database backup/restore functionality is broken. We feel that the ability to store long strings is more important than the DB restore, since Oracle 10g itself provides tools for backing up databases. PHPBB3-9132
* | | | | Merge branch 'ticket/rxu/9606' into develop-olympusAndreas Fischer2010-06-171-3/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/rxu/9606: [ticket/9606] Optimize unread search option.
| * | | | | [ticket/9606] Optimize unread search option.rxu2010-05-171-3/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Get rid of redundant SQL query in search.php that should increase performance slightly. PHPBB3-9606
* | | | | Merge branch 'ticket/jellydoughnut/9633' into develop-olympusAndreas Fischer2010-06-151-0/+1
|\ \ \ \ \
| * | | | | [ticket/9633] Newly Registered Group Colour not used in "Our Newest Member"Josh Woody2010-06-011-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Due to an oversight, the default group was not properly checked in the user_add function. This fix corrects the check. No other changes are needed because they go direct to the database, this one used an array in memory. PHPBB3-9633
* | | | | [ticket/9623] Proper UTF8 encoding for usernames in pruning sectionJosh Woody2010-06-151-4/+4
| |_|/ / |/| | | | | | | | | | | | | | | | | | | The username textboxes were not being properly encoded in UTF8. PHPBB3-9623
* | | | Merge branch 'feature/notify_status' into develop-olympusNils Adermann2010-05-301-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * feature/notify_status: [ticket/9179] Remove unnecessary newline.
| * | | | [ticket/9179] Remove unnecessary newline.Andreas Fischer2010-05-301-1/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | cc8d22bed6bdba0a8f5797eef3627a62c240a48f added one empty line too much. PHPBB3-9179
* | | | Merge branch 'ticket/nickvergessen/9147' into develop-olympusNils Adermann2010-05-301-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9147: [ticket/9147] "Change topic type"-option "Normal" always selected.
| * | | | [ticket/9147] "Change topic type"-option "Normal" always selected.Joas Schilling2010-05-281-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-9147
* | | | Merge branch 'ticket/nickvergessen/9135' into develop-olympusNils Adermann2010-05-301-1/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9135: [ticket/9135] Fix report-icon for moderators in PM folders.
| * | | | [ticket/9135] Fix report-icon for moderators in PM folders.Joas Schilling2010-05-261-1/+25
| |/ / / | | | | | | | | | | | | | | | | | | | | There was a S_TOPIC_REPORTED switch in the template of prosilver, which should indicate whether the PM is reported. But the variable was neither filled, nor named correctly. Now it is filled with a boolean and a link to the report is displayed for permitted users. PHPBB3-9135
* | | | Merge branch 'ticket/nickvergessen/9094' into develop-olympusNils Adermann2010-05-301-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9094: [ticket/9094] Hide "Copy permissions" message, when permissions were copied.
| * | | | [ticket/9094] Hide "Copy permissions" message, when permissions were copied.Joas Schilling2010-05-271-2/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | When creating a forum, you afterwards read "Forum created successfully. Now you are able to set permissions for this forum.", also when you already copied the permissions from another forum. PHPBB3-9094
* | | | Merge branch 'ticket/bantu/8792' into develop-olympusNils Adermann2010-05-301-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/8792: [ticket/8792] Add LDAP_SEARCH_FAILED string for when ldap_search() fails.
| * | | | [ticket/8792] Add LDAP_SEARCH_FAILED string for when ldap_search() fails.Andreas Fischer2010-05-161-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | No longer use LDAP_NO_SERVER_CONNECTION in case ldap_search() fails. Add and use LDAP_SEARCH_FAILED instead, so users can tell the difference between ldap_connect() failing and ldap_search() failing. PHPBB3-8792
* | | | [ticket/7782] Return 404 HTTP status code for nonexistent attachments.Oleg Pudeyev2010-05-171-1/+1
| | | | | | | | | | | | | | | | PHPBB3-7782
* | | | [ticket/7782] Added spaces.Oleg Pudeyev2010-05-171-1/+1
| | | | | | | | | | | | | | | | PHPBB3-7782
* | | | [ticket/7782] Added phpdoc comment for send_status_line function.Oleg Pudeyev2010-05-161-0/+20
| | | | | | | | | | | | | | | | PHPBB3-7782
* | | | [ticket/7782] Send status line using refactored download/file.php logic.Oleg Pudeyev2010-05-161-1/+22
|/ / / | | | | | | | | | PHPBB3-7782
* | | [feature/notify_status] Define'd constants for notify_statusMark2010-05-163-11/+16
| | | | | | | | | | | | | | | | | | | | | define'd constants NOTIFY_YES, NOTIFY_NO to replace magic numbers in forums_watch table and topics_watch table PHPBB3-9179
* | | Merge branch 'ticket/p/7782' into develop-olympusNils Adermann2010-05-161-0/+5
|\ \ \ | | | | | | | | | | | | | | | | * ticket/p/7782: [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is requested.
| * | | [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is ↵Oleg Pudeyev2010-05-161-0/+5
| | |/ | |/| | | | | | | | | | | | | requested. PHPBB3-7782
* | | Merge branch 'ticket/bantu/9547' into develop-olympusNils Adermann2010-05-161-2/+3
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9547: [ticket/9547] Use separate constants for display/enable active topics.
| * | | [ticket/9547] Use separate constants for display/enable active topics.Andreas Fischer2010-05-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split S_DISPLAY_ACTIVE_TOPICS into S_DISPLAY_ACTIVE_TOPICS and S_ENABLE_ACTIVE_TOPICS so we have correct default values when changing the forum type. PHPBB3-9547
* | | | Merge branch 'ticket/nickvergessen/9548' into develop-olympusNils Adermann2010-05-161-13/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9548: [ticket/9548] Delete user quicktool drop down should have an empty or invalid selection as the default
| * | | | [ticket/9548] Delete user quicktool drop down should have an empty or ↵Joas Schilling2010-04-181-13/+20
| | |/ / | |/| | | | | | | | | | | | | | | | | | invalid selection as the default PHPBB3-9548
* | | | Merge branch 'ticket/aptx/9525' into develop-olympusNils Adermann2010-05-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/aptx/9525: [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
| * | | | [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting ↵Marek A. Ruszczyński2010-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with :: :: can replace 1 or more groups (not 2 or more) PHPBB3-9524
* | | | | [ticket/9510] Unable to copy permissions from and to forums you cannot seeJosh Woody2010-05-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes the bug mentioned, plus a large number of regressions caused by changing the behavior of make_forum_select() (in svn r10427, dated Jan 18, 2010). It also rolls back the changes from branch "bug/58415", which are no longer needed. PHPBB3-9510
* | | | | [ticket/9510] Unable to copy permissions from and to forums you cannot seeJosh Woody2010-05-161-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes the bug mentioned, plus a large number of regressions caused by changing the behavior of make_forum_select() (in svn r10427, dated Jan 18, 2010). It also rolls back the changes from branch "bug/58415", which are no longer needed. PHPBB3-9510
* | | | | Merge branch 'ticket/nickvergessen/9546' into develop-olympusNils Adermann2010-05-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9546: [ticket/9546] Also delete bookmarks, when a topic is deleted.
| * | | | | [ticket/9546] Also delete bookmarks, when a topic is deleted.Joas Schilling2010-05-161-1/+1
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-9546
* | | | | Merge branch 'ticket/nickvergessen/9529' into develop-olympusNils Adermann2010-05-161-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | * ticket/nickvergessen/9529: [ticket/9529] Topic review is not showing all selected posts.
| * | | | [ticket/9529] Topic review is not showing all selected posts.Joas Schilling2010-05-161-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-9529
* | | | Merge branch 'ticket/nickvergessen/8894' into develop-olympusNils Adermann2010-05-161-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | * ticket/nickvergessen/8894: [ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if BBCodes are not allowed.
| * | | [ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if ↵Joas Schilling2010-05-161-1/+1
| |/ / | | | | | | | | | | | | | | | BBCodes are not allowed. PHPBB3-8894
* | | Merge branch 'ticket/bantu/9174' into develop-olympusNils Adermann2010-05-141-4/+1
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9174: [ticket/9173] No longer limit scope of numbers we store in the config table on
| * | | [ticket/9173] No longer limit scope of numbers we store in the config table onAndreas Fischer2010-05-141-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PostgreSQL and Firebird when using set_config_count(). Since we're using a VARCHAR(255) column to store the numbers we have to CAST the varchar string to a type we can do maths on. Using int4 or integer as the type however limits the scope to 4-byte-integer = 32-bit. Using DECIMAL(255, 0) allows the 'full' scope of decimals in varchar(255). PHPBB3-9173
* | | | Merge branch 'ticket/nickvergessen/7717' into develop-olympusNils Adermann2010-05-141-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/7717: [ticket/7717] Localise default extension groups for attachments
| * | | | [ticket/7717] Localise default extension groups for attachmentsJoas Schilling2010-05-141-1/+8
| | |/ / | |/| | | | | | | | | | PHPBB3-7717