Commit graph

14815 commits

Author SHA1 Message Date
Vjacheslav Trushkin
ae7d290a22 [feature/merging-style-components] Updating PHP files
Removing theme and template entries in all files, except for acp styles section

PHPBB3-10632
2012-03-14 23:24:16 +02:00
Joas Schilling
33dce916e2 [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
PHPBB3-10690
2012-03-14 22:22:22 +01:00
Vjacheslav Trushkin
234e5d6402 [feature/merging-style-components] Implementing unlimited parent templates
Implementing possibility of unlimited levels of parent templates. Paths are stored in style_parent_tree, entries are separated by /

PHPBB3-10632
2012-03-14 23:22:02 +02:00
Vjacheslav Trushkin
ae3b0f736d [feature/merging-style-components] Updating database and acp modules
Removing theme and template tables, adding new columns to styles table, deleting acp modules, deleting code that updates theme in updater

PHPBB3-10632
2012-03-14 23:18:18 +02:00
Vjacheslav Trushkin
b7d84a586c [feature/merging-style-components] Renaming template classes
Changing template classes prefixes from phpbb_template to phpbb_style (for classes that will work with styles) or phpbb_style_template (for classes that are specific to templates)

PHPBB3-10632
2012-03-14 23:12:11 +02:00
Vjacheslav Trushkin
7d414d04ca [feature/merging-style-components] Moving template classes to style
Moving includes/template/ to includes/style/, adding template_ prefix to classes that deal only with templates

PHPBB3-10632
2012-03-14 22:57:58 +02:00
Joas Schilling
ba6943a6a0 [ticket/10605] Prefix function with phpbb_ and use true instead of 1
PHPBB3-10605
2012-03-12 10:11:52 +01:00
Joas Schilling
3b7a6a3efa [ticket/10689] Fix "First character"-option in "Find a member"-search
PHPBB3-10689
2012-03-12 00:39:12 +01:00
rxu
ff8d523768 [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
PHPBB3-10684
2012-03-12 01:57:51 +08:00
rxu
da395edbca [ticket/10684] Remove intval mapping for array keys
PHP manual for arrays http://php.net/manual/en/language.types.array.php states
that the following key cast will occur: Strings containing valid integers will
be cast to the integer type. E.g. the key "8" will actually be stored under 8.
Thus, no intval mapping for numeric array keys is needed.

PHPBB3-10684
2012-03-12 01:47:28 +08:00
rxu
321d0d9b56 [ticket/10684] Adjust pm_notifications() to handle stale bans
- Add parameter (array) to the function phpbb_get_banned_users_ids()
- Fix function pm_notification() to handle users with stale bans

PHPBB3-10684
2012-03-12 01:44:00 +08:00
David King
7dfb8d7c20 Merge branch 'develop-olympus' into develop 2012-03-11 12:59:52 -04:00
David King
b652e1a1bb Merge branch 'unknownbliss/ticket/10697' into develop-olympus 2012-03-11 12:58:55 -04:00
Igor Wiedler
ae984025f0 Merge branch 'develop' into feature/event-dispatcher
* develop: (95 commits)
  [ticket/9084] Explain the logic.
  [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
  [ticket/9813] Only get posts table row count if we detected a fulltext index.
  [feature/append_var] Adding test case
  [ticket/7432] Delete redundant reference to "appropriate menu item".
  [ticket/10618] Change phpBB 3 to phpBB 3.1.
  [ticket/10685] Refactor template test defaults for php 5.4 compatibility.
  [feature/append_var] Adding append_var template class function
  [ticket/9813] Also use estimated row count of posts table for fulltext mysql.
  [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
  [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
  [ticket/10653] Add ability to count table rows to database abstraction layer.
  [ticket/9813] Use table status row count only if greater than 100000 or exact.
  [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
  [ticket/8652] Comment for also updating forum watch table in user_notification.
  [ticket/8652] Sending 2 emails on 2 replies
  [ticket/10680] Add /phpBB/ext/* to .gitignore
  [ticket/10672] Fix total post count language string in statistics and feed
  [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
  [ticket/10453] Fixing spacing
  ...

Conflicts:
	tests/bootstrap.php
2012-03-11 15:18:33 +01:00
Igor Wiedler
e02d92ac62 [feature/event-dispatcher] Use real EventDispatcher through composer
* replace the copy-pasta EventDispatcher with the real one from Symfony2
* use composer for managing this dependency, use composer autoloading

PHPBB3-9550
2012-03-11 15:15:33 +01:00
Igor Wiedler
5dd5df46a4 [feature/event-dispatcher] Remove copied EventDispatcher code
PHPBB3-9550
2012-03-11 14:55:30 +01:00
Michael Cullum
24f1896b3c [ticket/10697] Updating gitignore to match develop branch
PHPBB3-10697
2012-03-11 09:42:56 +00:00
rxu
a79b3490c2 [ticket/10684] Cast user_id to integer
PHPBB3-10684
2012-03-11 00:56:07 +08:00
Michael Cullum
668c61686b [ticket/10694] Adjusting details link to 5.3 announcement
PHPBB3-10694
2012-03-10 16:47:07 +00:00
Andreas Fischer
3850b05fbb Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7432] Delete redundant reference to "appropriate menu item".
  [ticket/7432] Explain what users are inactive in more detail.
2012-03-09 23:43:11 +01:00
Andreas Fischer
aee79c6cdb Merge remote-tracking branch 'p/ticket/7432' into develop-olympus
* p/ticket/7432:
  [ticket/7432] Delete redundant reference to "appropriate menu item".
  [ticket/7432] Explain what users are inactive in more detail.
2012-03-09 23:41:43 +01:00
rxu
89a6cb2886 [ticket/10684] Refactor $sql_ignore_users array update
PHPBB3-10684
2012-03-10 00:17:39 +08:00
Michael Cullum
fbe8086697 [ticket/10694] Update PHP warning to 5.3.2
PHPBB3-10694
2012-03-09 16:10:02 +00:00
rxu
f563647e4b [ticket/10684] Remove isset() for $sql_ignore_users update
PHPBB3-10684
2012-03-09 22:35:13 +08:00
Oleg Pudeyev
c001bb9c03 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9831] Fix saving unchecked checkbox field value
  [ticket/9831] Correctly store checkbox default value for boolean CPF.
2012-03-09 05:55:56 -05:00
Oleg Pudeyev
bd1fb91dd2 Merge remote-tracking branch 'rxu/ticket/9831' into develop-olympus
* rxu/ticket/9831:
  [ticket/9831] Fix saving unchecked checkbox field value
  [ticket/9831] Correctly store checkbox default value for boolean CPF.
2012-03-09 05:24:03 -05:00
Oleg Pudeyev
5c4788a24c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9084] Explain the logic.
  [ticket/9084] Don't hide 'non-entered' dropdown CPF value if not required
2012-03-09 04:42:16 -05:00
Oleg Pudeyev
0ec8e9dbff Merge remote-tracking branch 'rxu/ticket/9084' into develop-olympus
* rxu/ticket/9084:
  [ticket/9084] Explain the logic.
  [ticket/9084] Don't hide 'non-entered' dropdown CPF value if not required
2012-03-09 04:42:05 -05:00
Oleg Pudeyev
cd61de4bfd [ticket/9084] Explain the logic.
PHPBB3-9084
2012-03-09 04:35:09 -05: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
bb7e86c2b1 [ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used.
PHPBB3-10658
2012-03-08 15:19:15 +01:00
Oleg Pudeyev
35309de0b7 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
  [ticket/9813] Only get posts table row count if we detected a fulltext index.
  [ticket/9813] Also use estimated row count of posts table for fulltext mysql.
  [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
  [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
  [ticket/10653] Add ability to count table rows to database abstraction layer.
  [ticket/9813] Use table status row count only if greater than 100000 or exact.
  [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
2012-03-08 08:44:32 -05:00
Oleg Pudeyev
d380a1a36f Merge remote-tracking branch 'bantu/ticket/9813' into develop-olympus
* bantu/ticket/9813:
  [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
  [ticket/9813] Only get posts table row count if we detected a fulltext index.
  [ticket/9813] Also use estimated row count of posts table for fulltext mysql.
  [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
  [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
  [ticket/10653] Add ability to count table rows to database abstraction layer.
  [ticket/9813] Use table status row count only if greater than 100000 or exact.
  [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
2012-03-08 08:44:24 -05:00
Andreas Fischer
c11607bdd1 [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
There is no point in fetching the table status again.

PHPBB3-10653
2012-03-08 14:39:03 +01:00
Andreas Fischer
01d90e59a8 [ticket/9813] Only get posts table row count if we detected a fulltext index.
PHPBB3-9813
2012-03-08 14:38:59 +01:00
Vjacheslav Trushkin
f70786ab2e [feature/prosilver-cleanup/remove-tweaks2] Updating tweaks
Removing unnecessary tweaks, changing IE7 tweaks to modern code

PHPBB3-10622
2012-03-08 01:43:11 +02:00
Vjacheslav Trushkin
dfce7c7e96 [feature/prosilver-cleanup/remove-tweaks2] Copying common tweaks
Copying commonly used code from tweaks.css to common.css

PHPBB3-10622
2012-03-08 01:42:27 +02:00
Vjacheslav Trushkin
179fa3ef40 [feature/prosilver-cleanup/remove-tweaks2] Removing tweaks from forms
Removing IE6 tweaks from forms.css

PHPBB3-10622
2012-03-08 01:40:09 +02:00
Vjacheslav Trushkin
68fb7356b8 [feature/prosilver-cleanup/remove-tweaks2] Tweaks.css only for IE
Removing tweaks.css from stylesheet.css, including it for IE8 or older via conditional statements

PHPBB3-10622
2012-03-08 01:38:16 +02:00
Oleg Pudeyev
65e711cbb0 Merge remote-tracking branch 'cyberalien/feature/append_var' into develop
* cyberalien/feature/append_var:
  [feature/append_var] Adding test case
  [feature/append_var] Adding append_var template class function
2012-03-07 18:20:49 -05:00
Vjacheslav Trushkin
ebdd03872a [feature/append_var] Adding test case
Adding test case for append_var

PHPBB3-10666
2012-03-08 01:01:16 +02:00
Oleg Pudeyev
89a0cbc57e [ticket/7432] Delete redundant reference to "appropriate menu item".
PHPBB3-7432
2012-03-07 18:00:57 -05:00
Andreas Fischer
74dfea22a1 Merge remote-tracking branch 'p/ticket/10618' into develop
* p/ticket/10618:
  [ticket/10618] Change phpBB 3 to phpBB 3.1.
  [ticket/10618] Replace phpBB 3.0 with phpBB 3 for 3.1.
2012-03-07 12:56:32 +01:00
Andreas Fischer
0eb7f18c98 Merge remote-tracking branch 'p/ticket/10685' into develop
* p/ticket/10685:
  [ticket/10685] Refactor template test defaults for php 5.4 compatibility.
2012-03-07 12:37:53 +01:00
Oleg Pudeyev
6e207e3f69 [ticket/10618] Change phpBB 3 to phpBB 3.1.
PHPBB3-10618
2012-03-06 19:42:33 -05:00
Oleg Pudeyev
6e5fc53f0d [ticket/10685] Refactor template test defaults for php 5.4 compatibility.
PHPBB3-10685
2012-03-06 19:34:20 -05:00
Vjacheslav Trushkin
a98117b229 [feature/append_var] Adding append_var template class function
Adding append_var template class function

PHPBB3-10666
2012-03-05 02:41:42 +02:00
Andreas Fischer
785c75254e [ticket/9813] Also use estimated row count of posts table for fulltext mysql.
Since this is 'only' for statistics anyway, using an estimated value does no
harm. Also, if MyISAM is the underlying storage engine for the posts table,
the value will actually be exact.

PHPBB3-9813
2012-03-05 00:29:28 +01:00
Andreas Fischer
f3af5945e3 [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
PHPBB3-10653
2012-03-04 22:11:45 +01:00