1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

10799 Commits

Author SHA1 Message Date
Andreas Fischer
c8dd12e5f4 Merge remote-tracking branch 'gn36/ticket/11292' into develop-olympus
* gn36/ticket/11292:
  [ticket/11292] Fix: Newlines removed in display of PM reports
2013-01-06 02:11:10 +01:00
Oleg Pudeyev
989c4c3e64 [ticket/11293] Add a note that mysqli should be in front of mysql.
php 5.5 alpha 2 deprecated mysql extension, prefer mysqli if
both are available.

PHPBB3-11293
2012-12-25 00:11:34 -05:00
Martin Beckmann
5056f16235 [ticket/11292] Fix: Newlines removed in display of PM reports
Report text is run through make_clickable and bbcode_nl2br for PMs
just as it is for posts.

PHPBB3-11292
2012-12-24 04:16:08 +01:00
Oleg Pudeyev
86f0c0a6d5 Merge PR #1152 branch 'nickvergessen/ticket/11278' into develop-olympus
* nickvergessen/ticket/11278:
  [ticket/11278] Comment out the code for dropping the Q&A tables
  [ticket/11278] Fix not running queries from db tools in database update
2012-12-22 18:01:53 -05:00
Joas Schilling
68ffb106fb [ticket/11278] Comment out the code for dropping the Q&A tables
Due to a bug, vanilla phpbb could not create captcha tables in 3.0.8 on
firebird. It was possible for board administrators to adjust the code to
work. If code was manually adjusted by board administrators, index names
would not be the same as what 3.0.9 and newer expect. This code fragment
drops captcha tables, destroying all entered Q&A captcha configuration,
such that when Q&A is configured next the respective tables will be
created with corrent index names.

If you wish to preserve your Q&A captcha configuration, you can manually
rename indexes to the currently expected name:
 phpbb_captcha_questions_lang_iso  => phpbb_captcha_question_lang
 phpbb_captcha_answers_question_id => phpbb_captcha_answers_qid

Again, this needs to be done only if a board was manually modified to fix
broken captcha code.

PHPBB3-11278
2012-12-21 16:05:05 +01:00
Andreas Fischer
917a2fa9a6 [ticket/10880] The m_approve permisson no longer implies f_noapprove.
PHPBB3-10880
2012-12-19 22:02:39 -05:00
Joas Schilling
f0c780a453 [ticket/11278] Fix not running queries from db tools in database update
The db_tools class is running in return mode, which means that the queries
are not run, but just returned. Therefor the broken tables were not
removed from the database.

PHPBB3-11278
2012-12-19 13:38:16 +01:00
Nathan Guse
649e009f7b [ticket/8610] Update comment
PHPBB3-8610
2012-12-15 16:23:48 -06:00
Nathan Guse
2469225a72 Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610
# By Oleg Pudeyev (29) and others
# Via Andreas Fischer (3) and others
* 'develop-olympus' of github.com:phpbb/phpbb3: (36 commits)
  [ticket/11262] Add .lock in cache directory to .gitignore
  [ticket/11265] Add assertions for board installation success.
  [ticket/11162] Reformat.
  [ticket/10491] Make recreate_database static.
  [ticket/11162] Rename tricky updates to database helper.
  [ticket/10491] Install board once per test run.
  [ticket/10972] Drop user deletion.
  [ticket/10972] Tweak user addition.
  [ticket/10972] Add destroy method to mock cache.
  [ticket/10972] Add mock null cache.
  [ticket/10972] Backport get_db from develop.
  [ticket/10972] Added explicit checks for creating duplicate users.
  [ticket/10972] Moved tests into appropriate places and added comments
  [ticket/10972] Added methods for creating and deleting basic users
  [ticket/11162] Use empty($queries).
  [ticket/11162] Review comments fixed.
  [ticket/11162] Reformat.
  [ticket/11162] Newlines to LF.
  [ticket/11162] Use correct functions.
  [ticket/11162] Account for notify_status.
  ...

Conflicts:
	phpBB/includes/mcp/mcp_topic.php
2012-12-13 20:46:25 -06:00
Nathan Guse
a50907250e [ticket/8610] Use phpbb_update_rows_avoiding_duplicates
PHPBB3-8610
2012-12-13 20:42:10 -06:00
Nathan Guse
5c614ff624 [ticket/8610] Revert some funky merging I did from rebase
PHPBB3-8610
2012-12-13 20:32:43 -06:00
Nathan Guse
71bcc58fee [ticket/8610] Add some comments
PHPBB3-8610
2012-12-13 20:23:04 -06:00
Nathaniel Guse
5a88bd1bf1 [ticket/8610] Update Bookmarks and Subscriptions when splitting topics
Update bookmarks and subscriptions to add bookmarks/subscriptions to the
new topic when using the split_topic function

PHPBB3-8610
2012-12-13 20:23:03 -06:00
Nathaniel Guse
05d7decdd3 [ticket/8610] Update Bookmarks when merging posts into another topic
Update bookmarks to the new topic when merging posts into another topic
using the merge_posts function.

PHPBB3-8610
2012-12-13 20:19:27 -06:00
Nathaniel Guse
8dd2a151cc [ticket/8610] Update Bookmarks when forking topics
Update bookmarks to the new topic when forking topics using
the mcp_fork_topic function.

PHPBB3-8610
2012-12-13 20:19:26 -06:00
Nathaniel Guse
abcc59fca6 [ticket/8610] Update Bookmarks when merging topics
Update bookmarks to the new topic when merging multiple topics using
the merge_topics function.

PHPBB3-8610
2012-12-13 20:19:26 -06:00
Andreas Fischer
f4df152b4b Merge remote-tracking branch 'p/ticket/11162' into develop-olympus
* p/ticket/11162: (22 commits)
  [ticket/11162] Reformat.
  [ticket/11162] Rename tricky updates to database helper.
  [ticket/11162] Use empty($queries).
  [ticket/11162] Review comments fixed.
  [ticket/11162] Reformat.
  [ticket/11162] Newlines to LF.
  [ticket/11162] Use correct functions.
  [ticket/11162] Account for notify_status.
  [ticket/11162] This test really only works for bookmarks.
  [ticket/11162] The test is not at all trivial.
  [ticket/11162] Add includes.
  [ticket/11162] Move to a separate file to avoid blowing out functions.php.
  [ticket/11162] No whitespace changes in olympus.
  [ticket/11162] Fix inaccurately copy pasted comment.
  [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp.
  [ticket/11162] Clarify that only the two tables actually work.
  [ticket/11162] Uncomment transactions.
  [ticket/11162] An implementation that actually works.
  [ticket/11162] Make count function upper case.
  [ticket/11162] Rename count variable name to remaining_rows.
  ...
2012-12-14 02:55:07 +01:00
Oleg Pudeyev
e2c67a8e42 [ticket/11162] Rename tricky updates to database helper.
PHPBB3-11162
2012-12-12 21:46:38 -05:00
Andreas Fischer
b5f94a14f1 Merge remote-tracking branch 'p/ticket/10205' into develop-olympus
* p/ticket/10205:
  [ticket/10205] Reduce nesting in mysql drivers.
  [ticket/10205] Rewrite _sql_error implementations to have a single return.
  [ticket/10205] Cosmetic changes.
  [ticket/10205] Add some columns to the empty fixture file for mssqlnative.
  [ticket/10205] Delete stray return.
  [ticket/10205] Test failed connection attempts.
  [ticket/10205] Check for function existence in mssql connect method.
  [ticket/10205] Convert mssqlnative driver to the same logic.
  [ticket/10205] Fix a parse error in oracle driver.
  [ticket/10205] Fix remaining db drivers.
  [ticket/10205] Avoid calling mysqli functions when mysqli is missing.
  [ticket/10205] Account for potentially missing extensions in dbal.
2012-12-08 03:04:05 +01:00
Oleg Pudeyev
a8e74f5292 [ticket/10841] Revert more whitespace changes.
PHPBB3-10841
2012-12-05 12:07:37 -05:00
Oleg Pudeyev
0793f8e2e6 [ticket/10841] Revert whitespace changes.
PHPBB3-10841
2012-12-05 12:07:37 -05:00
Senky
120accb9d4 [ticket/10841] adding space after if
PHPBB3-10841
2012-12-05 12:07:37 -05:00
Senky
f7508c3f04 [ticket/10841] removing unnecessary spacing
PHPBB3-10841
2012-12-05 12:07:37 -05:00
Senky
dd6983b14b [ticket/10841] changing affectedrows check to COUNT in sql
this sould reduce load and be faster. Also freeresult functions added

PHPBB3-10841
2012-12-05 12:07:37 -05:00
Senky
af064cdaad [ticket/10841] Modifying style and language selectors in UCP
Commit also deletes all unnecessary blank spaces at
the end of the lines in both ucp_prefs_personal.html

PHPBB3-10841
2012-12-05 12:07:37 -05:00
Oleg Pudeyev
f5de11438c [ticket/11162] Use empty($queries).
PHPBB3-11162
2012-12-05 10:47:26 -05:00
Oleg Pudeyev
fe87d441ee [ticket/11162] Review comments fixed.
PHPBB3-11162
2012-12-05 10:44:36 -05:00
Oleg Pudeyev
16966f52d3 [ticket/11162] Reformat.
PHPBB3-11162
2012-12-05 10:41:08 -05:00
Oleg Pudeyev
94ebc57078 [ticket/11162] Newlines to LF.
PHPBB3-11162
2012-12-05 10:40:42 -05:00
Oleg Pudeyev
1e50116c54 [ticket/10602] Avoid a race condition.
PHPBB3-10602
2012-12-05 00:57:24 -05:00
Oleg Pudeyev
03f819862f [ticket/10602] Use last_queue_run for its intended purpose.
We keep the last queue run time around, therefore for determining
whether enough time has passed since the last run we can simply
use this config variable.

When there is no queue file we consider a queue run successful.

Previously queue.php ("cache file") modification time would be used
for determining whether enough time has passed since last queue run.
The problem was that modification time would be updated whenever
anything was added to the queue, creating a situation where if
queue is processed less frequently than it is added to that email
would not be sent.

PHPBB3-10602
2012-12-05 00:41:47 -05:00
Oleg Pudeyev
1a411c5658 [ticket/11162] Use correct functions.
PHPBB3-11162
2012-12-05 00:11:14 -05:00
Oleg Pudeyev
6872104aa9 [ticket/11162] Account for notify_status.
PHPBB3-11162
2012-12-05 00:07:01 -05:00
Oleg Pudeyev
abca64b1df [ticket/11162] Add includes.
PHPBB3-11162
2012-12-04 23:37:14 -05:00
Oleg Pudeyev
0f96b1aad3 [ticket/11162] Move to a separate file to avoid blowing out functions.php.
PHPBB3-11162
2012-12-04 23:35:34 -05:00
Oleg Pudeyev
5120f36a25 [ticket/10205] Reduce nesting in mysql drivers.
PHPBB3-10205
2012-12-04 21:33:13 -05:00
Oleg Pudeyev
597dea1e04 [ticket/10205] Rewrite _sql_error implementations to have a single return.
PHPBB3-10205
2012-12-04 21:32:02 -05:00
Oleg Pudeyev
89c9c9d4b0 [ticket/10205] Cosmetic changes.
PHPBB3-10205
2012-12-04 21:22:33 -05:00
Oleg Pudeyev
dc521692f3 [ticket/10205] Check for function existence in mssql connect method.
PHPBB3-10205
2012-12-04 16:14:39 -05:00
Oleg Pudeyev
de2fe1a308 [ticket/10205] Convert mssqlnative driver to the same logic.
PHPBB3-10205
2012-12-04 16:12:31 -05:00
Oleg Pudeyev
40db60e45f [ticket/10205] Fix a parse error in oracle driver.
PHPBB3-10205
2012-12-04 16:07:02 -05:00
Oleg Pudeyev
9f549e8249 [ticket/10205] Fix remaining db drivers.
PHPBB3-10205
2012-12-04 04:50:41 -05:00
Oleg Pudeyev
1a7e2211c3 [ticket/10205] Avoid calling mysqli functions when mysqli is missing.
PHPBB3-10205
2012-12-04 04:41:46 -05:00
Oleg Pudeyev
025a95ea90 [ticket/10205] Account for potentially missing extensions in dbal.
PHPBB3-10205
2012-12-04 04:40:47 -05:00
Oleg Pudeyev
6f7e39996c [ticket/11238] Set goutte version to 0.1.0.
PHPBB3-11238
2012-12-02 23:44:49 -05:00
Oleg Pudeyev
2fc43e6ed7 [ticket/11162] No whitespace changes in olympus.
PHPBB3-11162
2012-12-01 23:11:14 -05:00
Oleg Pudeyev
05053dacd3 [ticket/11162] Fix inaccurately copy pasted comment.
PHPBB3-11162
2012-12-01 23:09:32 -05:00
Oleg Pudeyev
69225bd0a6 [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp.
PHPBB3-11162
2012-12-01 23:09:31 -05:00
Oleg Pudeyev
c2c105df9f [ticket/11162] Clarify that only the two tables actually work.
PHPBB3-11162
2012-12-01 23:09:31 -05:00
Oleg Pudeyev
2e947334e5 [ticket/11162] Uncomment transactions.
PHPBB3-11162
2012-12-01 23:09:31 -05:00