1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-06 14:35:56 +02:00

19914 Commits

Author SHA1 Message Date
Joas Schilling
235f7c3721 Merge remote-tracking branch 'rxu3/ticket/12224' into develop
* rxu3/ticket/12224:
  [ticket/12224] Add assign_block_vars_array() test.
  [ticket/12224] Add template wrapper method to assign block arrays
2014-03-10 23:49:37 +01:00
rxu
d29514f3e7 [ticket/12224] Add assign_block_vars_array() test.
Add tests, also change return value to null.

PHPBB3-12224
2014-03-10 20:59:45 +08:00
Nathan Guse
c169583dc3 Merge pull request #2089 from nickvergessen/ticket/12251
[ticket/12251] Clean up and Enhancement of Custom Profile Fields
2014-03-09 17:26:22 -05:00
Nathan Guse
20723a9315 Merge pull request #2099 from bantu/ticket/12256
[ticket/12256] Selecting founders is fetching $sql instead of $result
2014-03-09 16:55:28 -05:00
Forumhulp.com
86845e48a2 [ticket/12256] Selecting founders is fetching $sql instead of $result
PHPBB3-12256
2014-03-09 21:37:44 +01:00
Joas Schilling
bc74819cc9 [ticket/12251] Remove leading whitespace on doc blocks
PHPBB3-12251
2014-03-09 21:13:04 +01:00
Nathan Guse
7ca762c524 Merge branch 'develop-olympus' into develop
* develop-olympus:
2014-03-09 11:15:58 -05:00
Nathan Guse
72e0fe0b22 Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10945-develop' into develop
* remotes/dhruvgoel92/ticket/10945-develop:
  [ticket/10945] Remove mark test incomplete for native search backend
  [ticket/10945] Fix Unit Tests as per new changes to split_keywords
  [ticket/10945] Remove mark test incomplete for mysql and postgres
  [ticket/10945] Fix return values for split_keywords function
  [ticket/10945] Display search query when search fails in native search
  [ticket/10945] remove trigger_error call
2014-03-09 11:15:48 -05:00
Nathan Guse
00f8fe24d2 Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10945' into develop-olympus
* remotes/dhruvgoel92/ticket/10945:
  [ticket/10945] Fix return values for split_keywords function
  [ticket/10945] Display search query when search fails in native search
  [ticket/10945] remove trigger_error call
2014-03-09 11:15:10 -05:00
Nathan Guse
c305bd25e4 Merge pull request #2074 from Crizz0/ticket/12240
Ticket/12240 - Adds specific class to BBCode-Buttons in Template incl. Custom-BBCode support
2014-03-08 19:20:22 -06:00
Nathan Guse
7880a87c5e Merge pull request #2094 from dhruvgoel92/ticket/11938
[ticket/11938] remove deprecated sql_attr_str2ordinal and use sql_attr_string
2014-03-08 19:17:46 -06:00
Dhruv
8290dd6b1c [ticket/11938] Fix whitespace characters
PHPBB3-11938
2014-03-09 01:17:36 +05:30
Dhruv
1207767bb3 [ticket/11938] use sql_attr_string instead of sql_attr_str2ordinal
PHPBB3-11938
2014-03-09 01:16:13 +05:30
Andreas Fischer
4fb19c8541 Merge pull request #2093 from nickvergessen/ticket/11764
[ticket/11764] Create separate packages for subsilver2 on releases.

* nickvergessen/ticket/11764:
  [ticket/11764] Create separate packages for subsilver2 on releases.
2014-03-08 18:48:40 +01:00
Joas Schilling
40e76c090e [ticket/11764] Create separate packages for subsilver2 on releases.
PHPBB3-11764
2014-03-08 17:37:29 +01:00
Dhruv
0036b00fc4 [ticket/10945] Remove mark test incomplete for native search backend
PHPBB3-10945
2014-03-08 21:46:14 +05:30
Dhruv
304c0799ba [ticket/10945] Fix Unit Tests as per new changes to split_keywords
PHPBB3-10945
2014-03-08 21:45:23 +05:30
Dhruv
41fa32bae4 [ticket/10945] Remove mark test incomplete for mysql and postgres
PHPBB3-10945
2014-03-08 21:45:07 +05:30
Dhruv
3b6d371310 Merge branch 'ticket/10945' into ticket/10945-develop
* ticket/10945:
  [ticket/10945] Fix return values for split_keywords function
  [ticket/10945] Display search query when search fails in native search
  [ticket/10945] remove trigger_error call

Conflicts:
	phpBB/phpbb/search/fulltext_native.php
2014-03-08 21:44:30 +05:30
Dhruv
c51dcbe6a0 [ticket/10945] Fix return values for split_keywords function
The function now returns false if all the words are common words and true
otherwise.

PHPBB3-10945
2014-03-08 21:23:08 +05:30
Dhruv
b6eec5c142 [ticket/10945] Display search query when search fails in native search
If search fails and common words are present, split_keywords returns false
and search.php file prints appropriate message of common words.
If search fails and there are no common words, split_keywords returns true
and keyword_search returns false so that the search query is displayed in
search box.

PHPBB3-10945
2014-03-08 21:20:37 +05:30
Dhruv Goel
f4645a6376 [ticket/10945] remove trigger_error call
removes trigger_error call incase no search results are found or start
variable exceeds the amount. So that search query is displayed in the
search box even if no results are returned.

PHPBB3-10945
2014-03-08 21:15:51 +05:30
Dhruv
9100f4ebbf Merge remote-tracking branch 'VarunAgw/ticket/12250' into develop
# By Varun Agrawal
# Via Varun Agrawal
* VarunAgw/ticket/12250:
  [ticket/12250] Remove deprecated phpbb_clean_path function
  [ticket/12250] Remove deprecated phpbb_clean_path function
2014-03-08 18:14:05 +05:30
Andreas Fischer
19d0c2abd5 Merge remote-tracking branch 'VSEphpbb/ticket/12248' into develop
* VSEphpbb/ticket/12248:
  [ticket/12248] Restore id attributes to extension details (used by tests)
2014-03-06 23:50:07 +01:00
Varun Agrawal
429c006440 [ticket/12250] Remove deprecated phpbb_clean_path function
The function phpbb_clean_path() in functions.php is deprecated and is
replaced by filesystem class. Therefore, this function is moved to the
functions_compatibility file.

PHPBB3-12250
2014-03-07 03:44:28 +05:30
Matt Friedman
aae22d699e [ticket/12248] Restore id attributes to extension details (used by tests)
PHPBB3-12248
2014-03-06 12:02:27 -08:00
Varun Agrawal
1cf8554d0e [ticket/12250] Remove deprecated phpbb_clean_path function
The function phpbb_clean_path() in functions.php is deprecated as is not
used used 3.0/3.1 core

PHPBB3-12250
2014-03-06 23:51:49 +05:30
Nathan Guse
c40b15ae19 Merge pull request #2087 from marc1706/ticket/12239
[ticket/12239] Move deprecated passwords functions to compatibility file
2014-03-06 07:00:30 -06:00
Joas Schilling
600e5f6c11 [ticket/12251] Add string validation for a-zA-Z0-9 and underscore
PHPBB3-12251
2014-03-06 12:28:36 +01:00
Joas Schilling
50165fe920 [ticket/12251] Load profile fields by default on posts, pms and memberlist
PHPBB3-12251
2014-03-06 12:08:46 +01:00
Joas Schilling
e6f492c7ac [ticket/12251] Enable displaying profile fields on memberlist, posts and pms
PHPBB3-12251
2014-03-06 12:02:11 +01:00
Joas Schilling
f0ac25f3c5 [ticket/12251] Deactivate outdated profile fields by default
PHPBB3-12251
2014-03-06 12:00:40 +01:00
Joas Schilling
d9c93337cc [ticket/12251] Sort IM profile fields alphabetically
PHPBB3-12251
2014-03-06 12:00:01 +01:00
Marc Alexander
6251ca1459 [ticket/12239] Move deprecated passwords functions to compatibility file
The deprecated passwords functions are no longer used in the core and have
been replaced with the passwords manager. Therefore, the functions are
moved to the functions_compatibility file.

PHPBB3-12239
2014-03-06 09:43:52 +01:00
Nathan Guse
4b6f3f8b0f Merge pull request #2088 from nickvergessen/ticket/12236
Ticket/12236 Convert AOL and Yahoo to custom profile fields
2014-03-05 18:44:39 -06:00
Joas Schilling
d380cdec02 [ticket/12236] Fix language key name for Yahoo Messanger
PHPBB3-12236
2014-03-06 01:41:38 +01:00
Nathan Guse
40c582688b Merge pull request #2054 from rxu/ticket/12213-1
[ticket/12213] Add MCP events for custom quick moderation options
2014-03-05 18:37:26 -06:00
Nathan Guse
c1ca74ee6d Merge pull request #2058 from nickvergessen/ticket/12216
[ticket/12216] Undefined index: lang_options when creating date profile field
2014-03-05 18:36:15 -06:00
Nathan Guse
9d25485b32 Merge pull request #2061 from rxu/ticket/12231
[ticket/12231] Add template events to forumlist_body.html
2014-03-05 18:33:27 -06:00
Nathan Guse
ad46fe62d8 Merge pull request #2075 from Elsensee/ticket/11693
[ticket/11693] Change sql_build_array to support DELETE
2014-03-05 18:31:36 -06:00
Nathan Guse
9b1b57c649 Merge pull request #2080 from nickvergessen/ticket/12243
[Ticket/12243] subsilver2 is missing profile field files
2014-03-05 18:29:07 -06:00
Nathan Guse
3ece3223e4 Merge pull request #2086 from VSEphpbb/ticket/12248
[ticket/12248] Make extension details homepage a clickable link
2014-03-05 18:27:29 -06:00
Matt Friedman
898976f8a1 [ticket/12248] Remove unused label for attributes and related id tags
PHPBB3-12248
2014-03-05 15:05:40 -08:00
Matt Friedman
2e49efc12d [ticket/12248] Use id instead of name attribute in a tags
PHPBB3-12248
2014-03-05 14:54:04 -08:00
Matt Friedman
4e770c2b42 [ticket/12248] Fix meta_author tags (IDs must be unique)
PHPBB3-12248
2014-03-05 14:53:31 -08:00
Matt Friedman
d0b07503ad [ticket/12248] Remove p tag in favor of strong tag
PHPBB3-12248
2014-03-05 14:45:45 -08:00
Joas Schilling
240eeec71d [ticket/12236] Change order of profile fields for new installs
PHPBB3-12236
2014-03-05 22:40:54 +01:00
Joas Schilling
e88c61f85e [ticket/12249] Fix "Undefined variable: row" when editing profile
PHPBB3-12249
2014-03-05 22:32:03 +01:00
Joas Schilling
fed3e7c2de [ticket/12236] Fix layout of memberlist search
PHPBB3-12236
2014-03-05 22:28:22 +01:00
Joas Schilling
f2059f52f3 [ticket/12236] Move AOL Instant Messanger field to custom profile field
PHPBB3-12236
2014-03-05 22:13:22 +01:00