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

377 Commits

Author SHA1 Message Date
Oleg Pudeyev
d5325e6934 Merge PR #624 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8743] Include poster´s name in mail notifications
2012-10-16 21:21:03 -04:00
Oleg Pudeyev
f0544c884f Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympus
* nickvergessen/ticket/8743:
  [ticket/8743] Include poster´s name in mail notifications
2012-10-16 21:20:58 -04:00
Oleg Pudeyev
ad2feb917f Merge PR #917 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10967] adding $root_path to posting_get_topic_icons
2012-10-16 20:31:03 -04:00
Senky
d434672dde [ticket/10967] adding $root_path to posting_get_topic_icons
PHPBB3-10967
2012-10-11 20:38:24 +02:00
David King
310c906932 Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop 2012-08-20 09:09:53 -04:00
Joas Schilling
01db8144d4 [feature/php-events] Fix doc of core.generate_smilies_after
PHPBB3-9550
2012-08-20 10:10:52 +02:00
Dhruv
938805106c [ticket/11052] pass parametes to search construct while posting
Proper parameters are passed in search backend constructor in
functions_posting.php

PHPBB3-11052
2012-08-15 21:09:42 +05:30
Joas Schilling
0d182d9e93 [feature/php-events] Fix naming and doc of core.generate_smilies_after
PHPBB3-9550
2012-08-04 17:07:35 +02:00
Michael Cullum
3f1b4e83ae [feature/events] Removing the third trigger_event parameter
PHPBB3-9550
2012-08-01 10:18:44 +02:00
Michael Cullum
8af7d225ef [feature/events] Change to use the new method of adding events
PHPBB3-9550
2012-08-01 10:18:44 +02:00
Joas Schilling
ddcd189006 [feature/events] Adding ledge generate_smilies_footer
Used by phpBB Gallery

PHPBB3-9550
2012-08-01 10:18:41 +02:00
Drae
922147f05a [ticket/10968] Render pagination within the template
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.

Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.

PHPBB3-10968
2012-07-18 14:30:20 +01:00
Joas Schilling
a259db7105 [ticket/10640] Do not change default value of truncate_string()
The default value should be kept, so we do not change the behaviour for MODs
and Extensions that use the function with its default values.

PHPBB3-10640
2012-06-17 19:07:17 +01:00
Igor Wiedler
1d4253319c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
  [ticket/10675] Add disk full language string when posting attachments
2012-03-31 19:29:56 +02:00
Igor Wiedler
3477b5e5a8 Merge remote-tracking branch 'Dickyf/ticket/10675' into develop-olympus
* Dickyf/ticket/10675:
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [ticket/10675] Add disk full language string when posting attachments
2012-03-31 19:27:19 +02:00
Andreas Fischer
cc13bac412 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10684] Adjust function and parameter name, minor changes.
  [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
  [ticket/10684] Remove intval mapping for array keys
  [ticket/10684] Adjust pm_notifications() to handle stale bans
  [ticket/10684] Cast user_id to integer
  [ticket/10684] Refactor $sql_ignore_users array update
  [ticket/10684] Remove isset() for $sql_ignore_users update
  [ticket/10684] Fix 2 typos in comment lines.
  [ticket/10684] Send notifications for users with stale bans

Conflicts:
	phpBB/includes/functions_user.php
2012-03-22 18:15:10 +01:00
rxu
5a9dd1994f [ticket/10684] Adjust function and parameter name, minor changes.
PHPBB3-10684
2012-03-22 21:19:01 +08:00
Richard Foote
97d4f168f5 [ticket/10675] Add disk full language string when posting attachments
Add language string visible by admins only for when the disk does not have
enough free space to upload attachments.

PHPBB3-10675
2012-03-19 15:08:28 -04:00
Joas Schilling
9915ed5255 [ticket/8743] Include poster´s name in mail notifications
PHPBB3-8743
2012-03-15 16:07:14 +01:00
rxu
a79b3490c2 [ticket/10684] Cast user_id to integer
PHPBB3-10684
2012-03-11 00:56:07 +08:00
rxu
89a6cb2886 [ticket/10684] Refactor $sql_ignore_users array update
PHPBB3-10684
2012-03-10 00:17:39 +08:00
rxu
f563647e4b [ticket/10684] Remove isset() for $sql_ignore_users update
PHPBB3-10684
2012-03-09 22:35:13 +08:00
rxu
ee6783109a [ticket/10684] Fix 2 typos in comment lines.
PHPBB3-10684
2012-03-09 16:41:49 +08:00
rxu
025de9ee19 [ticket/10684] Send notifications for users with stale bans
PHPBB3-10684
2012-03-08 23:28:03 +08:00
Andreas Fischer
d6a6d63a9e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8652] Comment for also updating forum watch table in user_notification.
  [ticket/8652] Sending 2 emails on 2 replies
2012-03-02 14:22:32 +01:00
Andreas Fischer
b74530259f [ticket/8652] Comment for also updating forum watch table in user_notification.
PHPBB3-8652
2012-03-02 14:20:29 +01:00
Bruno Ais
470b79c9e3 [ticket/8652] Sending 2 emails on 2 replies
This is a fix for the problem of the system sending 2 emails when there are 2
replies to a topic where the user is subscribed in a topic and the forum that
contains the topic.
This simple fix seems to solve the problem. In simple tests I made it shows
it does.

PHPBB3-8652
2012-03-02 11:08:56 +00:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
Oleg Pudeyev
90a7f55831 Merge remote-tracking branch 'nickvergessen/ticket/10484' into develop
* nickvergessen/ticket/10484:
  [ticket/10484] Use variables for sql_build_query() calls

Conflicts:
	phpBB/includes/mcp/mcp_front.php
2011-11-24 21:51:10 -05:00
Joas Schilling
4c77903129 [ticket/10484] Use variables for sql_build_query() calls
It's easier for mods/extensions to extend the arrays.

PHPBB3-10484
2011-11-21 16:22:07 +01:00
Igor Wiedler
b7c4fb38de Merge remote-tracking branch 'naderman/feature/extension-manager' into develop
* naderman/feature/extension-manager: (67 commits)
  [feature/extension-manager] Removing now unused acp_search code
  [feature/extension-manager] Split disabling extensions up into steps as well
  [feature/extension-manager] Add documentation on caching in ext finder
  [feature/extension-manager] Reference correct new module basenames in install
  [feature/extension-manager] Rename default methods to core methods on finder.
  [feature/extension-manager] Document what the class loader stores in cache
  [feature/extension-manager] Add docblock to cached paths map in class loader
  [feature/extension-manager] Clear up docs of extension related template changes
  [feature/extension-manager] Use "core files" instead of "global files" in docs
  [feature/extension-manager] Add docblocks to new search backend methods
  [feature/extension-manager] Add docblocks to new methods in functions_module
  [feature/extension-manager] Clarify comment on ext meta class instantiator
  [feature/extension-manager] Add more info on suffixes in extension finder
  [feature/extension-manager] Clarify is_dir parameter description
  [feature/extension-manager] Clarify class finding method docblock
  [feature/extension-manager] Correct default path comment & remove double strlen
  [feature/extension-manager] Fix "disbale" typo in comment
  [feature/extension-manager] Properly remove old ACP language loading code
  [feature/extension-manager] Support extensions in subdirectories of ext/
  [feature/extension-manager] Add prefix to extension meta data / install classes
  ...
2011-11-19 01:20:22 +01:00
Nils Adermann
3df4b83cd3 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9776] Delete poll if no poll options were submitted.
2011-11-18 20:31:40 +01:00
Joas Schilling
4fae5eef68 [ticket/9776] Delete poll if no poll options were submitted.
PHPBB3-9776
2011-11-18 20:29:50 +01:00
Nils Adermann
dcc5ca5377 [feature/extension-manager] Make search backends loadable from extensions
Search backends are now required to be autoloadable. The database updater to
3.1 tries to guess the class name as phpbb_search_<oldname> which works for
the default backends we ship.

PHPBB3-10323
2011-09-29 15:42:40 +02:00
Igor Wiedler
749ab6547d [ticket/9608] Remove use of references in topic_review
PHPBB3-9608
2011-08-14 20:22:28 +02:00
Nils Adermann
735cae076a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/6712] Properly explain result of setting the bump interval to 0.
  [ticket/6712] Add phpbb_ function name prefix, more docs, rename current_time
  [ticket/6712] Pass $post_data by the value instead of by the reference.
  [ticket/6712] Bump does not create new topic icon on index.

Conflicts:
	phpBB/includes/functions_posting.php
2011-06-10 00:26:41 +02:00
Nils Adermann
5b701dc3ed Merge branch 'ticket/rxu/6712' into develop-olympus
* ticket/rxu/6712:
  [ticket/6712] Properly explain result of setting the bump interval to 0.
  [ticket/6712] Add phpbb_ function name prefix, more docs, rename current_time
  [ticket/6712] Pass $post_data by the value instead of by the reference.
  [ticket/6712] Bump does not create new topic icon on index.
2011-06-10 00:24:43 +02:00
rxu
5254ec2795 [ticket/6712] Add phpbb_ function name prefix, more docs, rename current_time
PHPBB3-6712
2011-05-01 13:38:39 +08:00
Oleg Pudeyev
820f22f784 [ticket/9693] Removed useless $auth globalizations.
PHPBB3-9693
2011-04-30 13:20:27 -04:00
Oleg Pudeyev
9a8a8d41d3 [ticket/7252] Removed an outdated comment pertaining to PHP 4.x.
PHPBB3-7252
2011-04-17 18:41:18 -04:00
rxu
d1bd5962c7 [ticket/6712] Pass $post_data by the value instead of by the reference.
PHPBB3-6712
2011-04-03 01:00:21 +08:00
Callum Macrae
9399c7c46b [ticket/7834] Topic time didn't update when first post was deleted
When the first post of a topic was deleted, the topic time didn't
update - it should have changed to the time of the next post.

This commit simply applies lefty74's patch posted in the ticket. It gets
the post time of the next post from the database, and updates the thread
accordingly.

This patch is not my work at all and all credits go to lefty74, I just
transferred it onto GitHub

PHPBB3-7834
2011-02-24 22:36:35 +00:00
Andreas Fischer
ac26bb458f [ticket/9764] Allow $config['mime_triggers'] to be an empty string.
explode('|', '') and explode('|', NULL) both return array(0 => '') which can
cause filespec::check_content() to reject everything starting with a '<'
character in case $config['mime_triggers'] is an empty string or not set.

fileupload::set_disallowed_content() now filters out empty strings by calling
array_diff() on the passed array, so setting $config['mime_triggers'] to an
empty string will turn off mime checking completely.

On the other side we want to fail safe if $config['mime_triggers'] is not set
at all. To do this, the array fileupload::$disallowed_content now contains some
default strings to be filtered out.

PHPBB3-9764
2010-10-28 22:00:04 +02:00
rxu
4091f873ea [ticket/6712] Bump does not create new topic icon on index.
Handle the topic bumping process more properly.

PHPBB3-6712
2010-10-18 21:25:52 +08:00
Igor Wiedler
46810f8747 Merge branch 'ticket/bantu/9644' into develop-olympus
* ticket/bantu/9644:
  [ticket/9644] Check $mode before calling user_notification() from submit_post()
2010-09-16 22:42:07 +02:00
Joas Schilling
cc9a1952d9 [ticket/9635] Useless parameter $data['post_time'] in function submit_post.
PHPBB3-9635
2010-08-19 23:48:25 -04:00
Andreas Fischer
95e0340daf [ticket/9644] Check $mode before calling user_notification() from submit_post()
PHPBB3-9644
2010-07-23 20:30:21 +02:00
Joas Schilling
801a44b3f0 [ticket/9147] "Change topic type"-option "Normal" always selected.
PHPBB3-9147
2010-05-28 14:25:56 +02:00
Mark
cc8d22bed6 [feature/notify_status] Define'd constants for notify_status
define'd constants NOTIFY_YES, NOTIFY_NO to replace magic numbers in
forums_watch table and topics_watch table

PHPBB3-9179
2010-05-16 19:50:35 +02:00
Joas Schilling
a3874c2cd6 [ticket/9529] Topic review is not showing all selected posts.
PHPBB3-9529
2010-05-16 17:09:25 +02:00