289ac72485
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic).
[ticket/10606] Fix incorrect hidden fields array name in page_header().
2012-02-11 05:48:03 -05:00
a962e78854
[ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic).
...
Regression from dfb7cc625a
2012-02-09 15:34:04 +01:00
7a04c9048c
[ticket/9916] Updating header license and removing Version $Id$
...
PHPBB3-9916
2011-12-31 13:32:52 +00:00
94d954281e
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10319] Missing hidden fields in search form
2011-12-09 01:32:29 +01:00
dfb7cc625a
[ticket/10319] Missing hidden fields in search form
...
Missing hidden fields in search form (bug added in 3.0.9)
PHPBB3-10319
2011-12-09 01:31:41 +01:00
88ae40a4b1
[ticket/10345] Make use of the plural function in some basic places
...
PHPBB3-10345
2011-11-25 15:10:44 -05:00
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
ec1445371d
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10437] Do not display announcements that are waiting for approval
2011-11-13 15:35:27 +01:00
f00f3ad8ea
Merge remote-tracking branch 'nickvergessen/ticket/10437' into develop-olympus
...
* nickvergessen/ticket/10437:
[ticket/10437] Do not display announcements that are waiting for approval
2011-11-13 15:35:18 +01:00
91155d1330
[ticket/10437] Do not display announcements that are waiting for approval
...
PHPBB3-10437
2011-11-13 15:33:47 +01:00
526fca73e7
Merge remote-tracking branch 'nickvergessen/ticket/develop/10435' into develop
...
* nickvergessen/ticket/develop/10435:
[ticket/10435] Remove global announcement from forums total topic count
Conflicts:
phpBB/viewforum.php
2011-11-13 14:31:33 +01:00
c865146065
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10435] Readd local announcements to total topic count in viewforum
2011-11-13 14:29:21 +01:00
2d989d4322
Merge remote-tracking branch 'nickvergessen/ticket/10435' into develop-olympus
...
* nickvergessen/ticket/10435:
[ticket/10435] Readd local announcements to total topic count in viewforum
2011-11-13 14:13:42 +01:00
019e43bc2d
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10237] Display login-box for guests, when (un)subscribing
Conflicts:
phpBB/includes/functions_display.php
2011-11-11 22:17:12 +01:00
6a379f1a55
[ticket/10435] Remove global announcement from forums total topic count
...
We need to remove the global announcements from the forums total topic count,
otherwise the number is different from the one on the forum list.
PHPBB3-10435
2011-11-11 14:11:00 +01:00
0d3e9bf446
[ticket/10435] Readd local announcements to total topic count in viewforum
...
We need to readd the local announcements to the forums total topic count,
otherwise the number is different from the one in the forum list.
PHPBB3-10435
2011-11-11 14:06:02 +01:00
1a19388aa3
[ticket/10237] Display login-box for guests, when (un)subscribing
...
Also initialise $is_watching for PHP Notice: Undefined variable is_watching
PHPBB3-10237
2011-11-06 23:51:29 +01:00
830c3f4047
[feature/remove-imagesets] Adjustments to php files
...
Removing imagesets. Adjustments to php files
PHPBB3-10336
2011-09-04 01:08:00 +03:00
19925ad059
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10237] Also display login-box on subscribing
[ticket/10237] Handle watching and unwatching the same way.
[ticket/10237] Use confirm-box to handle unwatching a forum/topic actions
Conflicts:
phpBB/includes/functions_display.php
2011-07-16 21:57:16 -04:00
773561f862
[ticket/10237] Handle watching and unwatching the same way.
...
Also add some information to the confirm-box (forum_name / topic title)
PHPBB3-10237
2011-07-11 19:24:40 +02:00
b2f5d5c876
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
2011-06-19 17:58:16 +02:00
e2fe25fbdc
Merge remote-tracking branch 'naderman/ticket/10232' into prep-release-3.0.9
...
* naderman/ticket/10232:
[ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
2011-06-19 17:57:56 +02:00
93dba4b023
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10223] The search fid parameter is an array of forums not just an id
[ticket/10223] Check optional before file_exists and correct require path
[ticket/10223] requiring the new startup.php file conditionally.
2011-06-19 17:57:42 +02:00
d37e8dd6d3
[ticket/10223] The search fid parameter is an array of forums not just an id
...
PHPBB3-10223
2011-06-19 00:13:33 +02:00
6458a1a16a
[ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
...
Avoids the global hidden fields from functions.php overwriting local
searches.
PHPBB3-10232
2011-06-18 23:22:25 +02:00
d2f7782b75
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/7888] Swap in-forum/topic search to GET forms.
2011-06-09 21:59:52 +02:00
5b5ed96bc5
[ticket/7888] Swap in-forum/topic search to GET forms.
...
This will allow sending URLs to search results to other users. The advanced
search page has always worked like this, but these special pages used to
cause problems.
PHPBB3-7888
2011-06-09 21:53:12 +02:00
e7e98f1de5
Merge branch 'ticket/nickvergessen/7720' into develop-olympus
...
* ticket/nickvergessen/7720:
[ticket/7720] Fix alternative image-description for unread posts.
2010-07-14 20:55:49 +02:00
954b3c3484
[ticket/7720] Fix alternative image-description for unread posts.
...
Changed the wrong word "new" to "unread" as that is, what we show with the
red-icons, not whether the post is new or not. Language variables were
kept for backwards compatibility.
PHPBB3-7720
2010-07-14 20:55:07 +02:00
b939ce5940
[ticket/9012] Adjust shadow topic title to the title at the time it was moved.
...
Moved topics which have their title changed in the new forum will now show the
old title in the original viewforum instead of the new title.
PHPBB3-9012
2010-07-11 02:44:07 +02:00
925a135613
Merge branch 'bug/cs278/59465' into develop-olympus
...
* bug/cs278/59465:
[bug/59465] Remove start=0 from topic pagination links.
[bug/59465] Removes start=0 from URLs used by viewtopic and viewforum.
2010-04-04 15:32:36 +02:00
39f26c5cfd
[bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047 )
2010-04-04 12:23:07 +02:00
a3a8fb989c
[bug/59465] Removes start=0 from URLs used by viewtopic and viewforum.
...
Having start=0 makes search engines index the page twice once with and
once without the start=0 parameter. This results in duplicate results
in the search results. Patch contributed by nn-.
2010-03-18 17:22:30 +00:00
5e2e08b05d
Simplified login_box() and redirection after login. S_LOGIN_ACTION can now be used on every page. (Bug #50285 )
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10067 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-30 17:13:28 +00:00
38fcaaf1d2
instead of only enabling forum feeds in viewforum we set it on every location where forums are shown
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10029 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-20 12:19:48 +00:00
6262263aef
Fix bug #43295 - Moved topics show unapproved even without permissions in the new forum
...
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10006 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-17 13:32:41 +00:00
09ad10a734
ok, i am very sorry, but this needs to be fixed.
...
Generally, our config table is not really suited for holding large datasets. Because feed settings for the forums to enable news feeds and excluded forums rely on the forums itself we have decided to introduce a forum_options table where custom options can be stored.
Additionally, for this to work across all DBMS we support, we added a new method to the DBAL for the bitwise AND operator.
Also moved the forum/topic feed template variable to the location where they belong to (forum and topic view)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9965 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-12 15:00:47 +00:00
2d0d35db48
populate who is online only where required
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9961 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-12 10:30:37 +00:00
914687075d
Fix bug #15729 - Global announcements marked as read if all new topics in forum are viewed
...
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9926 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-05 12:51:48 +00:00
050567483f
Ability to fetch moderators with get_moderators() even if load_moderators setting is off. (Bug #35955 )
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9640 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-21 09:36:13 +00:00
ac9e147289
Apply append_sid() to newest/latest post links in viewforum/search and UCP main module. (Bug #26815 )
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9459 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-04-17 15:08:09 +00:00
213773e368
Really fix #13970 broken fix in r8853.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9003 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-11 18:23:12 +00:00
55d8d97d2f
Don't show forum subscription link on categories. #34895
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8994 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-10 17:52:14 +00:00
77cf8e50d9
further adjustments to exit; statements
...
force E_USER_ERROR to exit *always* - it is always a fatal error which should stop every execution happening
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8957 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-30 09:49:20 +00:00
e1d1c6039b
adding more hashes
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8904 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-22 13:25:28 +00:00
cac0a2255a
make topic icon image width/height available to viewforum and search templates (Bug #15934 )
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8857 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-16 15:06:19 +00:00
fbbc5ef04f
Do not display reported topic icon for shadow topics. (Bug #13970 )
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8853 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-16 12:50:11 +00:00
9db6e7caa6
#32585 - kudos to Dave84
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8770 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-18 13:08:08 +00:00
6926a35902
#31185
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8751 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-13 14:37:17 +00:00
81886c0eae
New parameter for redirect() to circumvent the cross-domain check.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8674 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-28 15:07:37 +00:00
