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

19260 Commits

Author SHA1 Message Date
Joas Schilling
2d116ffede [ticket/12783] Move phpbb/phpbb require version to extra
PHPBB3-12783
2014-06-28 13:06:46 +02:00
Tristan Darricau
6d40b87661 [ticket/12781] Template regex for IF catch too many things
PHPBB3-12781
2014-06-27 16:04:56 +02:00
Joas Schilling
404c2f1144 Merge pull request #2598 from Nicofuma/ticket/12716
[ticket/12716] Add the missing parameters in the call of clearToken

* Nicofuma/ticket/12716:
  [ticket/12716] Use a string as session_id
  [ticket/12716] Add regression test
  [ticket/12716] Add the missing parameters in the call of clearToken
2014-06-27 16:00:29 +02:00
Joas Schilling
919e1a6bc8 Merge pull request #2660 from marc1706/ticket/12764
[ticket/12764] Properly handle errors upon connecting to MySQLi database

* marc1706/ticket/12764:
  [ticket/12764] Properly handle errors upon connecting to MySQLi database
2014-06-27 15:39:07 +02:00
Joas Schilling
8fa4ca49e0 Merge pull request #2658 from lucifer4o/ticket/12771
[ticket/12771] Bug in profilefield_base_migration when used in ext

* lucifer4o/ticket/12771:
  [ticket/12771] Shanging substr to strpos
  [ticket/12771] Change var name
  [ticket/12771] Bug in profilefield_base_migration when used in ext
2014-06-27 15:30:49 +02:00
Joas Schilling
b0286bf854 Merge pull request #2636 from Dragooon/ticket/12759
[ticket/12759] Resolve query flooding while displaying large number of custom profile fields

* Dragooon/ticket/12759:
  [ticket/12759] Fix type_bool and type_dropdown's UCP fields
  [ticket/12759] Remove lang_helper from profilefields_manager
  [ticket/12759] Cache all lang_options in lang_helper instead
  [ticket/12759] Extra line in profilefields_manager
  [ticket/12759] Cache lang_options for pm_viewmessage
  [ticket/12759] Cache lang_options on memberlist
  [ticket/12759] Add phpDoc comments to explain get_option_lang
  [ticket/12759] Little code cleanup
  [ticket/12759] Make sure $field_id has unique elements
  [ticket/12759] Cache the lang options earlier
  [ticket/12759] Cache lang options for all fields while displaying
  [ticket/12759] Allow multiple fields to be loaded via get_option_lang
2014-06-27 15:20:21 +02:00
Marc Alexander
aadc6de9c4 Merge remote-tracking branch 'dragoon/ticket/12772' into develop-ascraeus 2014-06-27 15:17:51 +02:00
Shitiz Garg
6d464e0bc4 [ticket/12759] Fix type_bool and type_dropdown's UCP fields
PHPBB3-12759
2014-06-27 17:58:28 +05:30
Shitiz Garg
98262a5a17 [ticket/12759] Remove lang_helper from profilefields_manager
No longer required

PHPBB3-12759
2014-06-27 17:48:37 +05:30
Shitiz Garg
2cf4a4f6fe [ticket/12759] Cache all lang_options in lang_helper instead
PHPBB3-12759
2014-06-27 17:48:37 +05:30
Shitiz Garg
c1df2ce62a [ticket/12759] Extra line in profilefields_manager
PHPBB3-12759
2014-06-27 17:48:37 +05:30
Shitiz Garg
f776ac7d58 [ticket/12759] Cache lang_options for pm_viewmessage
PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
7484859c71 [ticket/12759] Cache lang_options on memberlist
PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
c82a0b74cf [ticket/12759] Add phpDoc comments to explain get_option_lang
PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
51bc31da20 [ticket/12759] Little code cleanup
PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
6251d68be4 [ticket/12759] Make sure $field_id has unique elements
Otherwise it would cause a bunch of repetitive IDs passed to the IN clause

PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
aebe03f88c [ticket/12759] Cache the lang options earlier
Previously it would re-run on every post

PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
6cf6ec3354 [ticket/12759] Cache lang options for all fields while displaying
Previously these would be fetched one field at one time, causing a large
number of queries in case there were large number of custom profile fields
and/or unique number of users in areas such as viewing topics. Resolve this
by caching them at once when generating data for displaying them in templates.

PHPBB3-12759
2014-06-27 17:48:36 +05:30
Shitiz Garg
6d23cc3a0e [ticket/12759] Allow multiple fields to be loaded via get_option_lang
PHPBB3-12759
2014-06-27 17:48:36 +05:30
Joas Schilling
18763d7286 Merge pull request #2493 from Nicofuma/ticket/12325
[ticket/12325] Automatic update should notify about outdated files

* Nicofuma/ticket/12325:
  [ticket/12325] Fix the language var name
  [ticket/12325] Update coding style in template
  [ticket/12325] Fix: add a missing colon
  [ticket/12325] Don't use L_COLON
  [ticket/12325] Fix: it's not stuck in an inifinite loop anymore
  [ticket/12325] Automatic update should notify about outdated files
2014-06-27 14:01:31 +02:00
Tristan Darricau
8e8b493fae [ticket/12777] Add is_purged()
PHPBB3-12777
2014-06-27 11:28:13 +02:00
Tristan Darricau
4d9e451f60 [ticket/12777] Update doc block of is_configured()
PHPBB3-12777
2014-06-27 11:23:11 +02:00
Tristan Darricau
d13e02c7b1 [ticket/12777] Rename extension status functions and add is_configured()
PHPBB3-12777
2014-06-27 10:49:13 +02:00
Joas Schilling
59c0a31fc4 [ticket/12645] Replace support links in SUPPORT_BODY with 3.1 links
PHPBB3-12645
2014-06-27 10:18:36 +02:00
Andreas Fischer
cc4f1e401e Merge pull request #2665 from nickvergessen/ticket/12196-ascraeus
[ticket/12196] Fix typo in "referrer"

* nickvergessen/ticket/12196-ascraeus:
  [ticket/12196] Fix typo in "referrer"
2014-06-26 23:46:40 +02:00
Joas Schilling
7e769083bf [ticket/12196] Fix typo in "referrer"
Referer is a typo in the HTTP RFC and should not be used in the UI

PHPBB3-12196
2014-06-26 23:44:21 +02:00
Andreas Fischer
ffa1f9baf5 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12196] Revert Fix typo "referer" in acp/attachments
2014-06-26 23:33:47 +02:00
Dhruv
a730c0291f [ticket/12196] Revert Fix typo "referer" in acp/attachments
This reverts commit 9bc1f7924d5ef00fb988b81347d4c5c730b25eb2.
https://tracker.phpbb.com/browse/PHPBB3-12196

PHPBB3-12196
2014-06-27 00:07:15 +05:30
n-aleha
a54d74bf09 [ticket/12773] Fix language variable name in cli extension enable command
PHPBB3-12773
2014-06-26 21:05:32 +03:00
Dhruv
eb3e1b35d6 Merge branch 'develop-olympus' into develop-ascraeus
# By Joas Schilling
# Via Dhruv (1) and Joas Schilling (1)
* develop-olympus:
  [ticket/12196] Fix typo "referer" in acp/attachments
2014-06-26 23:30:06 +05:30
Stanislav Atanasov
deb393bff3 [ticket/12771] Shanging substr to strpos
Logical change ...

PHPBB3-12771
2014-06-26 20:56:00 +03:00
Marc Alexander
9b27d00d5f Merge remote-tracking branch 'nickvergessen/ticket/12099' into develop-ascraeus
* nickvergessen/ticket/12099:
  [ticket/12099] Fix correction in path_helper test
  [ticket/12099] Prepend ./ to path to fix assets
  [ticket/12099] Deduplicate path generation
  [ticket/12099] Fix clean_path() ".." stripping when previous directory was "."
  [ticket/12099] Break clean_path tests with a simple test
  [ticket/12099] Clean paths in tests
  [ticket/12099] Correctly fix go back to root before prepending the root path
  [ticket/12099] Clean some paths before using them
  [ticket/12099] Fix several issues in path_helper test
2014-06-26 15:07:05 +02:00
Marc Alexander
eb9321c3a1 [ticket/9801] Remove spaces before * in docblock
PHPBB3-9801
2014-06-26 14:37:38 +02:00
Marc Alexander
40a65abc3a [ticket/12764] Properly handle errors upon connecting to MySQLi database
As the db_connect_id gets set up by mysql_init(), the db_connect_id will be an
object with empty settings instead of just empty. Even if mysql_real_connect()
encounters an error upon connecting, the db_connect_id is still set. This
will result in trying to just access the database which obviously does
nothing.
By setting db_connect_id to an empty string, the script will not try to query
th database and properly handle any errors that occur upon connecting.

PHPBB3-12764
2014-06-26 14:33:08 +02:00
Stanislav Atanasov
c14db9ccd0 [ticket/12771] Change var name
Change var name

PHPBB3-12771
2014-06-26 14:19:49 +03:00
Shitiz Garg
570acb7ccc [ticket/12772] Remove config_text parameter from message.form.topic
Broke Email topic since the topic_form class doesn't require this to be passed

PHPBB3-12772
2014-06-26 16:44:40 +05:30
Stanislav Atanasov
5a76b36dfb [ticket/12771] Bug in profilefield_base_migration when used in ext
The base migration class should create lang entry for the new CPF
but it is supposed to strip it of phpbb_ prefix. As extensions
CPFs do not use phpbb_ prefix it will not create a lang entry.
This is as simple solution as it can be done.

PHPBB3-12771
2014-06-26 13:18:27 +03:00
PayBas
de250273db [ticket/12662] Username <span> fix for list columns
PHPBB3-12662
2014-06-26 11:23:37 +02:00
Joas Schilling
9bc1f7924d [ticket/12196] Fix typo "referer" in acp/attachments
PHPBB3-12196
2014-06-25 23:17:02 +02:00
Joas Schilling
29ec455a45 [ticket/12462] Do not use string "None" for different options
... it limits translations.

PHPBB3-12462
2014-06-25 22:14:33 +02:00
Joas Schilling
8b00be6fce Merge pull request #2567 from Crizz0/ticket/12680
[Ticket/12680] - Adds alternative text to contact icon in viewtopic.php

* Crizz0/ticket/12680:
  [ticket/12680] Adds variable for guest user
  [ticket/12680] Brings back get_username_string()
  [ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname
  [ticket/12680] Still some problems with displaying the nickname in ucp
  [ticket/12680] Little changes, but some issues are still there
  [ticket/12680] Removes unnessesary $user->lang from CONTACT_USER
  [ticket/12680] Adds alternativ text with new variable to contact:
  [ticket/12680] Adds second alternativ text and font-size: 0 to remove text
  [ticket/12680] Adds alternative text to contact icon in viewtopic.php
2014-06-25 19:36:18 +02:00
PayBas
367c6aafca [ticket/12662] Fix notifications dropdown positioning for RTL
PHPBB3-12662
2014-06-25 14:19:09 +02:00
PayBas
419de00a9c [ticket/12662] Update subsilver2 index template event names
PHPBB3-12662
2014-06-25 14:19:08 +02:00
PayBas
6d641ad590 [ticket/12662] Update events docs from b5 to rc1/rc2
PHPBB3-12662
2014-06-25 14:19:07 +02:00
PayBas
9c2ef168c1 [ticket/12662] Move dropdown container from <li> to new inner div
PHPBB3-12662
2014-06-25 14:19:07 +02:00
PayBas
020218fcea [ticket/12662] Remove linklist container and update template events
PHPBB3-12662
2014-06-25 14:19:06 +02:00
PayBas
23caeb7712 [ticket/12662] Add span containers to all usernames for consistency
PHPBB3-12662
2014-06-25 14:19:06 +02:00
PayBas
775dc316b0 [ticket/12662] IE8 fixes
PHPBB3-12662
2014-06-25 14:19:05 +02:00
PayBas
dd18085ba6 [ticket/12662] Fix responsive positioning of notifications dropdown
PHPBB3-12662
2014-06-25 14:19:05 +02:00
PayBas
faa47cd176 [ticket/12662] Remove inherited props from ddown-extendended
PHPBB3-12662
2014-06-25 14:19:04 +02:00