Commit graph

17926 commits

Author SHA1 Message Date
Joas Schilling
b4e043ba15 Merge pull request #1630 from brunoais/ticket/11638
[ticket/11638] Variable names goof...
2013-07-30 03:27:22 -07:00
Bruno Ais
8295d0fb36 [ticket/11638] Variable names goof...
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-30 11:15:46 +01:00
Vjacheslav Trushkin
212294382d [ticket/11688] Rename purge_dir to remove_dir
PHPBB3-11688
2013-07-30 12:32:14 +03:00
Joas Schilling
8fd52c8243 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
2013-07-30 11:26:21 +02:00
Joas Schilling
d20979c43c Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
2013-07-30 11:25:32 +02:00
Joas Schilling
ddea90c802 Merge remote-tracking branch 'bantu/ticket/11524' into prep-release-3.0.12
* bantu/ticket/11524:
  [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
2013-07-30 11:23:55 +02:00
Vjacheslav Trushkin
c335edc038 [ticket/11754] Remove styleswitcher leftovers
PHPBB3-11754
2013-07-30 12:21:34 +03:00
Andreas Fischer
a3de463b30 [ticket/11753] Remove ?> from MySQL Upgrader.
PHPBB3-11753
2013-07-30 02:03:20 +02:00
Andreas Fischer
404f288113 [ticket/11753] Update MySQL upgrader schema data.
PHPBB3-11753
2013-07-30 02:01:24 +02:00
Andreas Fischer
8a6f3a5800 [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
... on PHP 5.4 or higher.

PHPBB3-11524
2013-07-30 01:54:11 +02:00
Joas Schilling
af0f5128c6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11752] HTTP -> HTTPs in email/installed.txt
2013-07-30 01:47:02 +02:00
Joas Schilling
ef1f3f17ce Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [ticket/11752] HTTP -> HTTPs in email/installed.txt
2013-07-30 01:46:23 +02:00
Joas Schilling
6ab4c9a702 Merge remote-tracking branch 'bantu/ticket/11752' into prep-release-3.0.12
* bantu/ticket/11752:
  [ticket/11752] HTTP -> HTTPs in email/installed.txt
2013-07-30 01:45:39 +02:00
Joas Schilling
32499c8808 [ticket/11574] Remove install/udpate/new/ fallback from database_update.php
Since we switched the order, everything should be in the normal root by
then.

PHPBB3-11574
2013-07-30 01:38:06 +02:00
Joas Schilling
0ff2e93c19 [ticket/11574] Do not display incompatible package note after successful update
PHPBB3-11574
2013-07-30 01:23:13 +02:00
Joas Schilling
91392c7288 Merge remote-tracking branch 'phpbb/develop' into ticket/11574
* phpbb/develop: (130 commits)
  [ticket/11638] Changed the layout to match the other similar commits
  [ticket/11640] removed the space that I wonder what it was doing there.
  [ticket/11749] Move event after all template data has been defined
  [ticket/10917] Variable used only once so delete it
  [ticket/10917] Revert use of phpbb wrapper
  [ticket/11749] Template events for topic_list_row_pre/append
  [ticket/11749] PHP Events for viewforum.php
  [ticket/11749] PHP Events for search.php
  [ticket/11740] Update FAQ to include Ideas Centre
  [ticket/11062] If user's language is english there is no further work needed
  [ticket/11062] Load new strings from user's language file if provided
  [ticket/10917] Using phpbb wrapper
  [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
  [ticket/11741] Fix empty brackets and remove bullet
  [ticket/11638] Removed the unneeded reset.
  [ticket/11638] Use the $parse_flags like the other commits
  [ticket/11638] Reverted to use the $parse tags way as the other ones
  [ticket/11638] Updated: bitwise $parse_flags use optionset()
  [ticket/11656] Made the check for the bitfield just like other PR's
  [ticket/11667] Use @inheritdoc
  ...
2013-07-30 01:06:11 +02:00
Andreas Fischer
18164e63e2 [ticket/11752] HTTP -> HTTPs in email/installed.txt
PHPBB3-11752
2013-07-30 01:06:10 +02:00
Joas Schilling
09de06cf15 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10917] Variable used only once so delete it
  [ticket/10917] Revert use of phpbb wrapper
2013-07-30 00:49:29 +02:00
Joas Schilling
69feffec8b Merge remote-tracking branch 'Elsensee/ticket/10917-2' into develop-olympus
* Elsensee/ticket/10917-2:
  [ticket/10917] Variable used only once so delete it
  [ticket/10917] Revert use of phpbb wrapper
2013-07-30 00:46:18 +02:00
Joas Schilling
5f3f41d6d6 [ticket/11574] Remove old "continue step"-message
PHPBB3-11574
2013-07-29 23:47:31 +02:00
Joas Schilling
5bb08a1ab9 [ticket/11574] Change order of files and database update
PHPBB3-11574
2013-07-29 21:30:01 +02:00
Joas Schilling
db78c11702 Merge pull request #1625 from brunoais/ticket/11640
[ticket/11640] removed the space that I wonder what it was doing there.
2013-07-29 09:09:46 -07:00
Joas Schilling
49d908e959 Merge pull request #1624 from brunoais/ticket/11638
[ticket/11638] Changed the layout to match the other similar commits
2013-07-29 09:09:07 -07:00
Bruno Ais
ccc5c5f6b8 [ticket/11638] Changed the layout to match the other similar commits
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-29 17:00:51 +01:00
Bruno Ais
b8fef3b33a [ticket/11640] removed the space that I wonder what it was doing there.
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11640
2013-07-29 16:55:58 +01:00
Nathan Guse
6da63f3ad8 Merge pull request #1597 from marc1706/ticket/11723
[ticket/11723] Correctly redirect user to agreement page and let him leave
2013-07-29 07:45:51 -07:00
Nathan Guse
7027610e23 Merge pull request #1542 from brunoais/ticket/11638
[ticket/11638] generate_text_for_display on viewtopic.php
2013-07-29 07:42:32 -07:00
Nathan Guse
8cc2725703 Merge pull request #1576 from brunoais/ticket/11640
[ticket/11640] generate_text_for_display on functions_privmsgs.php
2013-07-29 07:29:25 -07:00
Nathan Guse
7003f98d03 Merge pull request #1586 from brunoais/ticket/11654
[ticket/11654] generate_text_for_display on mcp/mcp_warn.php
2013-07-29 07:26:15 -07:00
Nathan Guse
6cbe887ea0 Merge pull request #1619 from VSEphpbb/ticket/11749
[ticket/11749] PHP and Template Events for Topic Preview Extension
2013-07-29 07:18:41 -07:00
Matt Friedman
9902f1c751 [ticket/11749] Move event after all template data has been defined
PHPBB3-11749
2013-07-29 00:05:31 -07:00
Oliver Schramm
dd875f13e8 [ticket/10917] Variable used only once so delete it
The variable $this->unequal_version was only used once
and only to display the version the package updates to.
To display the version it updates to makes no sense when
the update files just aren't meant to update from the
current version. (It's already shown in an error message)
So I deleted the variable from there.

Furthermore the use of version_compare makes the variable
useless in that context which is why I deleted the variable
from the whole file and replaced it in the relevant if statement
with the old comparison.

PHPBB3-10917
2013-07-28 13:55:37 +02:00
Oliver Schramm
d8584877a1 [ticket/10917] Revert use of phpbb wrapper
PHPBB3-10917
2013-07-27 22:37:44 +02:00
Matt Friedman
8e636e4572 [ticket/11749] Template events for topic_list_row_pre/append
PHPBB3-11749
2013-07-27 10:48:40 -07:00
Matt Friedman
9ffb150d47 [ticket/11749] PHP Events for viewforum.php
PHPBB3-11749
2013-07-27 10:45:40 -07:00
Matt Friedman
9e68404de5 [ticket/11749] PHP Events for search.php
PHPBB3-11749
2013-07-27 10:44:39 -07:00
Nathaniel Guse
26dac64d45 Merge branch 'develop-olympus' into develop
# By Oliver Schramm
# Via Nathaniel Guse (1) and Oliver Schramm (1)
* develop-olympus:
  [ticket/10917] Using phpbb wrapper
  [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
2013-07-25 13:36:52 -05:00
Nathaniel Guse
935001b7a2 Merge remote-tracking branch 'remotes/Elsensee/ticket/10917' into develop-olympus
# By Oliver Schramm
# Via Oliver Schramm
* remotes/Elsensee/ticket/10917:
  [ticket/10917] Using phpbb wrapper
  [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
2013-07-25 13:36:29 -05:00
Nathaniel Guse
bea1ce92a1 Merge branch 'develop-olympus' into develop
# By Oliver Schramm
# Via Nathaniel Guse (1) and Oliver Schramm (1)
* develop-olympus:
  [ticket/11062] If user's language is english there is no further work needed
  [ticket/11062] Load new strings from user's language file if provided
2013-07-25 13:34:10 -05:00
Nathaniel Guse
162ea10b6a Merge remote-tracking branch 'remotes/Elsensee/ticket/11062' into develop-olympus
# By Oliver Schramm
# Via Oliver Schramm
* remotes/Elsensee/ticket/11062:
  [ticket/11062] If user's language is english there is no further work needed
  [ticket/11062] Load new strings from user's language file if provided
2013-07-25 13:32:23 -05:00
Oliver Schramm
866e475f96 [ticket/10037] Apply attached patch with a few changes
PHPBB3-10037
2013-07-25 15:47:55 +02:00
Andreas Fischer
5ebc36f583 Merge remote-tracking branch 'Elsensee/ticket/11741' into develop
* Elsensee/ticket/11741:
  [ticket/11741] Fix empty brackets and remove bullet
2013-07-25 14:20:29 +02:00
Andreas Fischer
8e1801698e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11740] Update FAQ to include Ideas Centre
2013-07-25 14:08:06 +02:00
Andreas Fischer
76a7d544cf Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [ticket/11740] Update FAQ to include Ideas Centre
2013-07-25 14:07:53 +02:00
Andreas Fischer
469d9ee171 Merge remote-tracking branch 'unknownbliss/ticket/11740' into prep-release-3.0.12
* unknownbliss/ticket/11740:
  [ticket/11740] Update FAQ to include Ideas Centre
2013-07-25 14:07:10 +02:00
MichaelC
c5de4dd51d [ticket/11740] Update FAQ to include Ideas Centre
PHPBB3-11740
2013-07-25 13:06:11 +01:00
Oliver Schramm
7304ac9c3c [ticket/11062] If user's language is english there is no further work needed
PHPBB3-11062
2013-07-25 13:10:45 +02:00
Oliver Schramm
a9f0577502 [ticket/11062] Load new strings from user's language file if provided
PHPBB3-11062
2013-07-25 12:29:25 +02:00
Joas Schilling
593ab9362e Merge remote-tracking branch 'brunoais/ticket/11656' into develop
* brunoais/ticket/11656:
  [ticket/11656] Made the check for the bitfield just like other PR's
  [ticket/11656] Wrong bitwise OR
  [ticket/11656] Remove line break in function call
  [ticket/11656] generate_text_for_display on memberlist.php
2013-07-24 22:14:52 +02:00
Oliver Schramm
e805036963 [ticket/10917] Using phpbb wrapper
PHPBB3-10917
2013-07-24 19:08:49 +02:00