1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 20:45:29 +02:00

13843 Commits

Author SHA1 Message Date
Oleg Pudeyev
b96a2fce28 Merge PR #1178 branch 'marc1706/ticket/10949' into develop
# By Marc Alexander (2) and Callum Macrae (1)
# Via Marc Alexander
* marc1706/ticket/10949:
  [ticket/10949] Remove not needed comma
  [ticket/10949] Converted missing code to new JS coding guidelines
  [ticket/10949] Converted AJAX coding standards to new guidelines.
2013-01-08 16:36:35 -05:00
Andreas Fischer
ef8cc04dc8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11292] Fix: Newlines removed in display of PM reports
2013-01-06 02:12:25 +01:00
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
Andreas Fischer
b7bd657882 Merge remote-tracking branch 'marc1706/ticket/11311' into develop
* marc1706/ticket/11311:
  [ticket/11311] Include asset core.js in subsilver2 overall_footer.html
2013-01-06 01:47:42 +01:00
Marc Alexander
4773eb3583 [ticket/11311] Include asset core.js in subsilver2 overall_footer.html
Without the inclusion of core.js the timezone functions will not properly
work. They refer to phpbb which is defined in core.js.

PHPBB3-11311
2013-01-05 11:42:58 +01:00
Marc Alexander
be77194435 [ticket/10949] Remove not needed comma
This comma might actually cause issues in browser. Therefore remove it.

PHPBB3-10949
2013-01-05 11:40:41 +01:00
Erik Frèrejean
68baee4ce2 [ticket/11309] phpbb_extension_interface::disable_step correct docblock.
The `@return` documentation of the `phpbb_extension_interface::disable_step`
method states incorrect that the method returns null, as it returns
false or a state.

PHPBB3-11309
2013-01-04 23:59:34 +01:00
Marc Alexander
b5cc1ed683 [ticket/10949] Converted missing code to new JS coding guidelines
A few missing semi-colons were also added where needed.

PHPBB3-10949
2013-01-04 22:46:12 +01:00
Marc Alexander
46c33e08b5 Merge remote-tracking branch 'callumacrae/ticket/10949' into ticket/10949
Conflicts:
	phpBB/assets/javascript/core.js
2013-01-04 20:46:56 +01:00
Andreas Fischer
228580b674 Merge remote-tracking branch 'erikfrerejean/ticket/11283' into develop
* erikfrerejean/ticket/11283:
  [ticket/11283] Extension manager follow symlinks.
2013-01-03 04:10:04 +01:00
Oleg Pudeyev
300b8236eb Merge PR #1153 branch 'marc1706/ticket/10805' into develop
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/10805:
  [ticket/10805] Compare phpbbAlertTimer against null
  [ticket/10805] Clear loading alert timeout after ajax request finished
2013-01-02 16:56:38 -05:00
Marc Alexander
e211009eb7 [ticket/11302] Correctly select first timezone or selected timezone
While registering, we should default to a given timezone. By selecting the
first timezone by default, this is fulfilled. This doesn't happen
currently, as only the "Select a timezone" selection appears.
If a user selects a timezone during the registration process we should
also make sure that the selected element is still selected; even if we
have to return to the registration page, i.e. if there was an error while
submitting the form. This is currently not the case.
With this patch the javascript code will behave correctly.
Additionally, a duplicate inclusion of timezone.js has been removed as it
was not needed.

PHPBB3-11302
2013-01-02 22:05:14 +01:00
Oleg Pudeyev
c8c6eb46ec [ticket/11305] Check for $cache being null before using it in db drivers.
There is no reason why db drivers must have a cache to work.
They query the database, that part works without caches.

PHPBB3-11305
2013-01-02 14:36:14 -05:00
Marc Alexander
48b6e45f7c [ticket/10805] Compare phpbbAlertTimer against null
PHPBB3-10805
2013-01-02 16:44:05 +01:00
Oleg Pudeyev
bc317c49a7 [ticket/11305] Define hook finder as a service on the container.
PHPBB3-11305
2013-01-02 01:36:50 -05:00
Oleg Pudeyev
3360d4cfce [ticket/11305] Adjust comment.
PHPBB3-11305
2013-01-02 01:32:22 -05:00
Oleg Pudeyev
210f627f67 [ticket/11305] Use phpbb_create_default_container.
PHPBB3-11305
2013-01-02 01:31:06 -05:00
Oleg Pudeyev
8d3edd4128 [ticket/11305] Create a normal container during final installation step.
The final step calls a bunch of code which expects a full phpBB
runtime environment. Also, by this step everything should be configured
and database schema set up.

Therefore, in the final step replace installer container with a normal
phpBB container.

PHPBB3-11305
2013-01-02 01:29:32 -05:00
Oleg Pudeyev
b94f9ae302 [ticket/11305] Retrieve cache driver from container rather than cache service.
This only covers some of the call sites.

PHPBB3-11305
2013-01-02 01:29:32 -05:00
Oleg Pudeyev
7adae349a9 [ticket/11305] Extract hook finder from cache service.
Unlike most other things in cache service, hook finder does not need
a database connection.

PHPBB3-11305
2013-01-02 01:29:32 -05:00
Igor Wiedler
21eb8d842b [ticket/11306] Add docblocks to all container related functions
PHPBB3-11306
2013-01-02 06:41:40 +01:00
Igor Wiedler
ea24de8de3 [ticket/11306] Introduce phpbb_create_default_container
Extracts default container construction to factory function, removing
boilerplate duplication for container construction.

PHPBB3-11306
2013-01-02 06:41:35 +01:00
Marc Alexander
5d07ddffaf [ticket/10805] Clear loading alert timeout after ajax request finished
The timeout for the "request timed out" popup should be cleared if it
finished. Since it is currently not cleared, the timeout alert appears as
an extra overlay if another ajaxified function is ran within 5 seconds of
the initial function call. This patch will take care of clearing the
timeout if either the success (function return_handler()) or error
(function error_handler()) functions are called.

PHPBB3-10805
2013-01-01 20:29:30 +01:00
Andreas Fischer
53c4257bfa Merge remote-tracking branch 'p/ticket/11037' into develop
* p/ticket/11037:
  [ticket/11037] Fix unit tests.
  [ticket/11037] Update services.yml.
  [ticket/11037] Add/update docblocks.
  [ticket/11037] Eliminate globals from cache service.
2012-12-31 01:11:19 +01:00
Andreas Fischer
01227cdca5 Merge remote-tracking branch 'p/ticket/11188' into develop
* p/ticket/11188:
  [ticket/11188] Reduce waste.
  [ticket/11188] add result count query for author search
  [ticket/11188] add count query to postgres search
2012-12-31 00:56:15 +01:00
Andreas Fischer
3a0e98a3bd Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11293] Add a note that mysqli should be in front of mysql.
2012-12-31 00:54:31 +01:00
Oleg Pudeyev
3d27ed13f5 [ticket/11188] Reduce waste.
PHPBB3-11188
2012-12-30 18:50:09 -05:00
Dhruv
763f2929ba [ticket/11188] add result count query for author search
PHPBB3-11188
2012-12-30 18:50:09 -05:00
Dhruv
979edc4113 [ticket/11188] add count query to postgres search
PHPBB3-11188
2012-12-30 18:50:05 -05:00
Oleg Pudeyev
4dcc8cabae Merge PR #1130 branch 'EXreaction/ticket/11259' into develop
* EXreaction/ticket/11259:
  [ticket/11259] htmlspecialchars($phpbb_admin_path)
  [ticket/11259] adm_relative_path -> phpbb_adm_relative_path
  [ticket/11259] Also make adm_relative_path available in the container
  [ticket/11259] Make phpbb_admin_path available everywhere

Conflicts:
	phpBB/install/index.php
	phpBB/install/install_update.php
2012-12-29 13:45:40 -05:00
Oleg Pudeyev
58aa593e39 [ticket/11037] Update services.yml.
PHPBB3-11037
2012-12-26 17:57:05 -05:00
Oleg Pudeyev
bad7661ee9 [ticket/11037] Add/update docblocks.
PHPBB3-11037
2012-12-26 10:47:03 -05:00
Andreas Fischer
cb7f6deb07 Merge remote-tracking branch 'p/ticket/10758' into develop
* p/ticket/10758:
  [ticket/10758] Add return to the other compat function.
  [ticket/10758] Add periods.
  [ticket/10758] Yes, only one empty line.
  [ticket/10758] Add deprecated tags.
  [ticket/10758] Add compat functions.
  [ticket/10758] Admin is not working yet.
  [ticket/10758] Test moderator and admin permissions.
  [ticket/10758] Check that acl was changed in the test.
  [ticket/10758] Extract obtain_user_data for the benefit of tests.
  [ticket/10758] Functional test for changing a user's permission.
  [ticket/10758] Spelling fix.
  [ticket/10758] Add a test for acp login.
  [ticket/10758] Dependency inject parameters into update_foes.
  [ticket/10758] Dependency inject parameters into cache_moderators.
2012-12-25 15:18:47 +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
Oleg Pudeyev
0b47a7823a [ticket/11037] Eliminate globals from cache service.
PHPBB3-11037
2012-12-24 15:36:43 -05:00
Oleg Pudeyev
8707a34135 [ticket/10758] Add return to the other compat function.
PHPBB3-10758
2012-12-24 15:12:57 -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
Erik Frèrejean
cac3936066 [ticket/11283] Extension manager follow symlinks.
All extensions are located in the `phpBB/ext` directory,
however the `phpbb_extension_manager::all_available()`
method only looks into actual directories and ignores symlinks.

Add the `RecursiveDirectoryIterator::FOLLOW_SYMLINKS` flag to
the `new RecursiveDirectoryIterator` call so that you can store
extensions in a different location and use symlinks so that
phpBB can recognise them.

PHPBB3-11283
2012-12-23 16:20:37 +01:00
Oleg Pudeyev
4f477791ec Merge PR #1152 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11278] Comment out the code for dropping the Q&A tables
  [ticket/11278] Fix not running queries from db tools in database update

Conflicts:
	phpBB/install/database_update.php
2012-12-22 18:06:42 -05: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
Oleg Pudeyev
496529fa71 [ticket/10758] Add periods.
PHPBB3-10758
2012-12-22 17:54:54 -05:00
Oleg Pudeyev
aaaf8a5332 [ticket/10758] Yes, only one empty line.
PHPBB3-10758
2012-12-22 17:40:25 -05:00
Andreas Fischer
7f0fa6477f Merge remote-tracking branch 'p/ticket/11248' into develop
* p/ticket/11248:
  [ticket/11248] Convert line endings to LF - develop edition.
2012-12-22 23:25:54 +01:00
Andreas Fischer
4b808e2671 Merge remote-tracking branch 'p/ticket/11037' into develop
* p/ticket/11037:
  [ticket/11037] Eliminate global $db usage in cache drivers.
2012-12-22 23:21:19 +01: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
9365d71b6b Merge remote-tracking branch 'nickvergessen/ticket/11277' into develop
* nickvergessen/ticket/11277:
  [ticket/11277] Correctly remove user_dst column on database update
2012-12-21 15:47:35 +01:00
Joas Schilling
5f56804a96 [ticket/11277] Correctly remove user_dst column on database update
The db_tools is running in "return statement" mode, so the queries to
modify the data are not executed, but just returned.

PHPBB3-11277
2012-12-21 15:29:54 +01:00
David King
a89ed49cbf [ticket/11287] Add template event naming to docs/coding-guidelines.html
PHPBB3-11287
2012-12-20 16:40:53 -05:00
Oleg Pudeyev
31b5f91ea1 Merge PR #1148 branch 'imkingdavid/feature/events' into develop
* imkingdavid/feature/events: (65 commits)
  [feature/events] Fix improperly named event in documentation
  [feature/events] Fix alphabetization of events
  [feature/events] Put events in alphabetical order
  [feature/events] Make EVENTS.md lowercase
  [feature/events] Use ` to escape HTML tags in markdown
  [feature/events] Remove HTML tags from markdown so they don't get parsed
  [feature/events] Remove extraneous space
  [feature/events] Add markdown template event documentation file
  [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)
  [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)
  [feature/events] Fix typo in event name
  [feature/events] Fix more subsilver2 events
  [feature/events] Fix some subsilver2 events
  [feature/events] Append "_append" to viewtopic_print_head
  [feature/events] ucp_pm_viewmessage_print_head_append
  [feature/events] simple_footer_end -> simple_footer_after
  [feature/events] Append "_prepend" to posting_editor_options
  [feature/events] Fix events in prosilver overall_header.html
  [feature/events] Fix events in prosilver overall_footer.html
  [feature/events] Rename index_body_info_blocks: index_body_stat_blocks_before
  ...
2012-12-20 15:10:46 -05:00
David King
00c61f9060 [feature/events] Fix improperly named event in documentation
PHPBB3-9550
2012-12-20 15:03:45 -05:00