Skip to content

Commit

Permalink
Merging 1.8/develop into 1.7/master
Browse files Browse the repository at this point in the history 
commit 30ba478c040efc41907c13e6e9402d824fa87242
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sat Jul 12 14:42:42 2014 +0200

    add the defined route name to the route object

commit 5a2f31bf66986c5d2bf54bb0af9297c43a53dd6a
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sat Jul 12 12:51:04 2014 +0200

    validate the returned content type against the accept header
present; related #1600

commit 6958e061a76407f3262916c9462aba4a8f095d9b
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri Jul 11 18:36:08 2014 +0200

    fixed typo

commit 677cc719af21f53f0cc4da6a4db43c1ecab1900b
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri Jul 11 18:24:06 2014 +0200

    allow reassignment of the fieldset field's fieldset; close #1682

commit 9894accf99fb685a92f2411731af0c69cd2e1168
Merge: 95500de 47d32da
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Fri Jul 11 17:59:16 2014 +0200

    Merge pull request #1697 from propcom/bugfix-request-comparison

    strict comparison of requests to stop recursion from type juggling

commit 95500de632ffbac57b4ebd9adf4d171e687fdcd7
Merge: 744440c f6c31c1
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Fri Jul 11 17:49:27 2014 +0200

    Merge pull request #1695 from kenjis/fix_test

    Fix No tests found in class "Fuel\Core\TestCase" #1694

commit 744440cee43226616d5af97f5d13cca58aa6382d
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri Jul 11 17:45:08 2014 +0200

    Added an XCache backed cache driver; related #1683

commit 512356c26ef47c7c093948e80976764b64e92320
Merge: 53a8676 86c624c
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Fri Jul 11 17:14:18 2014 +0200

    Merge pull request #1698 from kenjis/fix_phpunit

    Add modules testsuite to phpunit.xml

commit 53a8676bed6df76e50477f435e5f9e33cc387f66
Merge: 5e0344d b903e33
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Fri Jul 11 17:10:56 2014 +0200

    Merge pull request #1699 from kenjis/fix_error

    Fix potential XSS in error message

commit 5e0344d7b826a3b630f6a7f4205a6369bff6054b
Merge: 9eb8b80 c084638
Author: Steve "Uru" West <uruwolf@gmail.com>
Date:   Thu Jul 10 18:44:17 2014 +0100

    Merge pull request #1729 from jedkirby/patch-1

    Bugfix GD Driver

commit c084638d7078f5f3223975fb5c451bde7fb58e3a
Author: James Kirby <jedkirby@users.noreply.github.com>
Date:   Thu Jul 10 17:51:38 2014 +0100

    Bugfix GD Driver

    Set background colour based on config.

commit 9eb8b8066d681a8b3adb6df1e266c807be851e7f
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Thu Jul 10 17:19:34 2014 +0200

    make sure the PHPSecLib base class is loaded before accessing it's
constants; related #1728

commit fe08325dfe36b14c210614003adda17ede1b10ed
Merge: 0f7e769 a244bb8
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Thu Jul 10 09:47:42 2014 +0200

    Merge pull request #1723 from xrobau/feature/phpseclib-upgrade

    phpseclib upgrade

commit a244bb8d73e2fb56b9b7d305baa29afd91c8f455
Author: Rob Thomas <xrobau@gmail.com>
Date:   Thu Jul 10 10:08:29 2014 +1000

    Replace deprecated pbkdf2 implementation

commit 0f7e769bd666bb103d834354088c6c8928c8cf90
Merge: b1cb1db 761f12a
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Wed Jul 9 15:43:22 2014 +0200

    Merge pull request #1708 from kenjis/fix_shutdown

    Add logging Exception in shutdown

commit b1cb1db04167ba8c93474826e820468e0cb45204
Merge: 69eac80 898acd6
Author: Steve "Uru" West <uruwolf@gmail.com>
Date:   Wed Jul 9 13:09:15 2014 +0100

    Merge pull request #1727 from JackBlower/1.8/develop

    Quick fix for temporal join values.

commit 898acd6e44e3e7d35eccc49911f1c3bb8e588659
Author: Jack Blower <Jack.Blower@veinteractive.com>
Date:   Wed Jul 9 13:00:02 2014 +0100

    Reverts the regex to the known working one.

commit 31b398b0706bfe9a7b7ce5f4cbe49f5569c66b3a
Author: Jack Blower <Jack.Blower@veinteractive.com>
Date:   Wed Jul 9 12:04:24 2014 +0100

    Quick fix for temporal join values.

commit 69eac80b0d9ef5acb32a6e86e32ebb4ea2ecc762
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Mon Jul 7 20:46:41 2014 +0200

    pass the error code of the underlying PDO driver in
Database_Exceptions

commit 6a3ac403080fce6438b8827b1bddc654e831f150
Merge: 2dad3ef 12a4a7c
Author: Steve "Uru" West <uruwolf@gmail.com>
Date:   Sun Jul 6 22:18:09 2014 +0100

    Merge pull request #1724 from stairwell/my_branch

    Fixed typo in Autoloader

commit 12a4a7cde3b1e0e2dce238d5b444c1033b0a3a61
Author: Ethan Sattler <mcdasethan2@gmail.com>
Date:   Sun Jul 6 16:53:30 2014 -0400

    Fixed typo in Autoloader

commit 2c3aaa273ca9aff2779c10343f528b6b2768015c
Author: Rob Thomas <xrobau@gmail.com>
Date:   Fri Jul 4 04:16:27 2014 +1000

    Remove manual loading, rely on autoloader

commit e76885db49e3aacf561e4e587a3ade65d1931212
Author: Rob Thomas <xrobau@gmail.com>
Date:   Thu Jul 3 11:49:38 2014 +1000

    Namespace patch only

commit ea499d9cc8126f4d28fe96a8e6946a93084d358c
Author: Rob Thomas <xrobau@gmail.com>
Date:   Thu Jul 3 11:36:05 2014 +1000

    Raw checkin of updated phpseclib

commit 2dad3eff49aed57361cff27dd45836b39f908eca
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Tue Jul 1 12:59:48 2014 +0200

    Create CONTRIBUTING.md

commit e3101ae8ab51c9ea5d34017a5e3184ad8c8af1fc
Merge: aa36789 532536f
Author: Steve "Uru" West <uruwolf@gmail.com>
Date:   Mon Jun 30 15:05:21 2014 +0100

    Merge pull request #1721 from Onuma0519/1.8/develop

    overhead

commit 532536f3817c60c0f00b3cefc65aaf5a4d448960
Author: Onuma0519 <onuma.hironori@gmail.com>
Date:   Mon Jun 30 22:24:03 2014 +0900

    overhead

    http://de1.php.net/manual/en/function.array-push.php
    Note: If you use array_push() to add one element to the array it's
better to use $array[] = because in that way there is no overhead of
calling a function.

commit aa367897e9adee196c2aaac0e2b381418a274f60
Merge: baffe6b 065a05b
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Wed Jun 25 22:12:56 2014 +0200

    Merge pull request #1720 from sarciszewski/patch-1

    Update crypt.php

commit 065a05bd96be29e2bce5a0786e88f6768e49d69d
Author: Scott Arciszewski <scott@arciszewski.me>
Date:   Wed Jun 25 16:01:29 2014 -0400

    Update crypt.php

    This is probably pedantic, but every other implementation uses ===

commit baffe6b9baa204a5a5298f2cfc81e794d9ade131
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Wed Jun 25 14:34:28 2014 +0200

    changed the default location for themes to APPPATH.'themes'

commit 80829b2e91256bc79590733e3a5d9fa59b0d64ef
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Wed Jun 25 13:32:59 2014 +0200

    add a random identifier to the session payload to make it unique

    this avoids an update without any affected rows on certain platforms
    when session updates happen within the same second

commit 75ef168370130abba3a1961c35891d3904472470
Merge: c7fbd42 b04c391
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Sat Jun 21 16:23:33 2014 +0200

    Merge pull request #1715 from CodeYellowBV/1.8/develop

    Fixed unit test for agent so that it uses the correct browscap.ini
file.

commit c7fbd4207612ba5932d8d2fa9d97abd70b303ae5
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri Jun 20 21:46:44 2014 +0200

    missed adding the new argument to the closure

commit fd57431cc34d4d6b2eaafe2deba34fa00a3418d9
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri Jun 20 21:31:29 2014 +0200

    added support for download disposition to support inline downloads

commit b04c3917e75b33867be96d1ddc29d31a49540c05
Author: Burhan Zainuddin <burhan@codeyellow.nl>
Date:   Fri Jun 20 12:51:12 2014 +0200

    Fixed unit test for agent so that it uses the correct browscap.ini
file.

commit eca3f639cd9258ecbe54a958e6b2b6e82aedc1d7
Merge: 4d4d42c e67120c
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Wed Jun 18 10:40:16 2014 +0200

    Merge pull request #1713 from kenjis/aspectmock

    Auto detect AspectMock on testing

commit e67120c5b8be38dd9da92493a0ea972b435e9339
Author: kenjis <kenji.uui@gmail.com>
Date:   Wed Jun 18 15:33:25 2014 +0900

    Auto detect AspectMock on testing

    Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>

commit 4d4d42cf27b190ea2da9029a7f6fb7ad307a7971
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Tue Jun 17 19:08:24 2014 +0200

    add the session ID to the error message

commit 0ef3d4f9b0451036eeb46a8a276d5a3445ba671d
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Tue Jun 17 19:08:05 2014 +0200

    check if there is a session instance before using it

commit b5ff8cc6dc262a3389431960d46f4bad260db1a1
Merge: be848b8 854f453
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Sun Jun 15 13:30:10 2014 +0200

    Merge pull request #1710 from
KenjiOhtsuka/1.8/bugfix/modify_error_message

    modify error message, etc.

commit 854f453f7dcc1d438cfee7314b6a4725483513d2
Author: Kenji Ohtsuka <kok.fdcm@gmail.com>
Date:   Sat Jun 14 05:07:32 2014 -0700

    correct error message

commit be848b8859715f0fd5aa513933a450f71c79491f
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sat Jun 14 14:05:04 2014 +0200

    attempt fix of broken lost session recovery using the previous id

commit ca1cdc29504358394a8f663bc109db3aa7b7027e
Merge: d3a2565 63dde02
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Sat Jun 14 13:44:17 2014 +0200

    Merge pull request #1709 from kenjis/fix_session

    Fix session database error handling

commit 63dde02abc8a7c601ac57584375b2131814a7fb9
Author: kenjis <kenji.uui@gmail.com>
Date:   Fri Jun 13 16:26:43 2014 +0900

    Fix session database error handling

    Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>

commit 761f12a994e561177feadb2c234cab3a82fe321c
Author: kenjis <kenji.uui@gmail.com>
Date:   Fri Jun 13 14:59:49 2014 +0900

    Add logging Exception in shutdown

    Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>

commit d3a2565ac0a03da2c1c17d51ebde94246f6398df
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Thu Jun 12 12:22:10 2014 +0200

    no session cookie is not an error state

commit 2de045f5665c9b156d78daff952fc8f63e4ac8b8
Merge: 4ffc324 776860e
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Thu Jun 12 10:48:09 2014 +0200

    Merge pull request #1706 from CodeYellowBV/1.8/develop

    Ensure tests clean up any changes made to the environment.

commit 776860e200dd070b548e519d949827483b9909a3
Author: Peter Bex <peter@codeyellow.nl>
Date:   Wed Jun 11 09:40:13 2014 +0200

    Ensure tests clean up any changes made to the environment.

    This is desirable because changes to the environment can influence
    the pass/fail status of other tests, which makes them dependent on
    the order in which they are executed.  This matters when running
    subsets of tests with --group, or when using phpunit-randomizer,
    for example.

commit 4ffc3247f7a975c03a220c8c86bd91ffb2e5e166
Merge: 3dc0cca 0e9d746
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Mon Jun 9 12:03:58 2014 +0200

    Merge pull request #1696 from propcom/cli-extras

    Cli extras

commit 0e9d746fdcd0cb593c1cd7b5b33dec5e7676bb7f
Author: Alastair McGowan-Douglas <alastair@propcom.co.uk>
Date:   Mon Jun 9 10:04:31 2014 +0100

    More usefully, the new methods return the *old* filehandle

commit 3dc0cca3d9fe3ab219e7e3544f733d58e090607f
Merge: 21acfab 389f822
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Sun Jun 8 17:05:26 2014 +0200

    Merge pull request #1701 from julesjanssen/1.8/develop

    fix check for opcache use

commit 389f8227243c66f959e75065817e52a4f73294be
Author: Jules Janssen <jules@julesj.nl>
Date:   Sat Jun 7 15:24:10 2014 +0200

    fix check for opcache use

commit b903e3358f58afbb4e3ceea5bd7dad817e1df223
Author: kenjis <kenji.uui@gmail.com>
Date:   Sat Jun 7 20:01:37 2014 +0900

    Fix potential XSS in error message

    Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>

commit 86c624c06ccf16e9407bd22ce45a27ed270648ce
Author: kenjis <kenji.uui@gmail.com>
Date:   Sat Jun 7 18:20:54 2014 +0900

    Add modules testsuite to phpunit.xml

    Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>

commit 47d32da409fcda877744978df2710a4566496a33
Author: Andrew Wheal <andreww@propcom.co.uk>
Date:   Fri Jun 6 16:38:22 2014 +0100

    strict comparison of requests to stop recursion from type juggling

commit 02180ada7a8ab43144f6b4bf496f5fd75fea2928
Author: Alastair McGowan-Douglas <alastair@propcom.co.uk>
Date:   Fri Jun 6 16:13:34 2014 +0100

    Accidentally returned the wrong thing from Cli::stderr

commit 6486d96e86738fab1ddeb5e20beafc42df1783da
Author: Alastair McGowan-Douglas <alastair@propcom.co.uk>
Date:   Fri Jun 6 10:06:47 2014 +0100

    Cli's stderr() and stdout() now return the resource

commit 0222e02d4ad255abac5a43e4297cc462fe12aa18
Author: Alastair McGowan-Douglas <alastair@propcom.co.uk>
Date:   Thu Jun 5 17:46:19 2014 +0100

    Implement the string arguments to stderr and stdout

commit 41ccf1b71e0e3ebcc95f4fc2f700bc343cdf94f2
Author: Alastair McGowan-Douglas <alastair@propcom.co.uk>
Date:   Thu Jun 5 17:38:28 2014 +0100

    Simple CLI output redirection with stdout() and stderr() methods

commit ffd498b299583e2eba850c196e715daf28696783
Author: Alastair McGowan-Douglas <alastair@propcom.co.uk>
Date:   Thu Jun 5 17:38:09 2014 +0100

    public \Cli::$nocolor to turn colouration off

commit 21acfabe4ac43712997289841bd121c50a042f2f
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Mon Jun 2 21:31:54 2014 +0200

    new config option to force Asset to resolve it's assets locally

commit f6c31c156dc69c705bd116595419b7f8af49e905
Author: kenjis <kenji.uui@gmail.com>
Date:   Tue May 27 07:13:40 2014 +0900

    Fix No tests found in class "Fuel\Core\TestCase" #1694

    Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>

commit 1d8259abb6e3d3edd81f8e6f6c48635230f926f1
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Thu May 22 16:43:01 2014 +0200

    possible fix for loss of session due to concurrent session id
rotation

commit 9e03c4ed71e74af4525f14868369e30a8a889520
Merge: 6b51297 ebcede8
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Tue May 20 15:35:44 2014 +0200

    Merge pull request #1693 from phil-lavin/bugfix-theme-array-merge

    Default to config::get should be empty array as we explicitly merge
2 lines below

commit ebcede869cc3efe453f60ad25d8f92754bde3a51
Author: Phil Lavin <phil@propcom.co.uk>
Date:   Tue May 20 13:19:11 2014 +0100

    Default to config::get should be empty array as we explicitly merge
2 lines below

commit 6b51297caef1d56f8cc8816d55bbf16b0218c82b
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Mon May 19 14:35:52 2014 +0200

    fixed broken debug unit test; closes #1691

commit 40133c9861b8cdcc773ee6538478af9ecfab2940
Merge: 06aa230 73d4a0f
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Sat May 17 19:55:16 2014 +0200

    Merge pull request #1690 from perdodi/1.8/develop

    connect to database when getting driver name

commit 06aa230181750a5f85a91baa32ceed32f35bf8bb
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sat May 17 19:08:51 2014 +0200

    allow import() to load app classes too

commit 679bc826e6d7cd71795c30c5a079aec80cb07270
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sat May 17 14:27:25 2014 +0200

    added set_safe() to presenter, to be fully compatible with View

commit 99fe861e46e2fc62cebc4acecfe5e15a285c9729
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sat May 17 13:49:11 2014 +0200

    deprecated Viewmodel; introduced Presenter

commit 7574d5c78aae52ecdbedd138b2614bb2345ecff5
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri May 16 22:08:04 2014 +0200

    fixed potential vulnerability in quoting identifies in a SQL command

commit f708cc36e55177fc411bfe1c884bc321a24a14bd
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri May 16 21:19:10 2014 +0200

    fixed passing NULL as a join value was converted to empty string

commit 73d4a0fe64bdaf58d1b92040da99abe846a796dc
Author: perdodi <perdodi@users.noreply.github.com>
Date:   Fri May 16 19:00:01 2014 +0200

    set_charset() different db types

    set_charset() extended to support different db types.
    SQLServer encoding setting moved under set_charset() from connect().
    Doesn't add "charset=..." when db type is SQLite

commit 031ad89f03df1b9de642ce1cb76fe30ef9547ff2
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri May 16 18:14:41 2014 +0200

    Changed the Viewmodel class name to conform to the standards
(ucfirst)

commit b2b762ad31282381be02c48e2038375db73b5ae2
Author: perdodi <perdodi@users.noreply.github.com>
Date:   Fri May 16 17:49:07 2014 +0200

    making sure the database is connected

    Getting driver name throws exception (see below), when database is
not connected. This may happen when extending Query Builder with driver-
dependent functionality (LIMIT and OFFSET on Access or SQL Server, for
instance).

    ```
    ErrorException [ Fatal Error ]:
    Call to a member function getAttribute() on a non-object
    ```

commit 7a557be0f3c738f4439e2ed180f38a19f3f8b0db
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri May 16 09:21:11 2014 +0200

    php classnames are case insensitive, so the autoloader should be too

commit 6ae9bc46c5f4c47505f91e8218b80bc8d2d702f1
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Thu May 15 23:12:29 2014 +0200

    use a custom browscap file for controlled agent class tests. fixes

commit 7cbe5cb48b49a6163837782549da4ae695738235
Merge: ffcf299 84c1c37
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Thu May 15 23:10:38 2014 +0200

    Merge pull request #1687 from kenjis/fix_agent

    Add logging if downloading browscap fails

commit ffcf29943cc2fb4fa3bb078b68c9ffdc26e88a70
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Thu May 15 22:14:14 2014 +0200

    do not cache array results; closes #1688

commit 84c1c371ccc0153348a35e46b764eb726a672336
Author: kenjis <kenji.uui@gmail.com>
Date:   Thu May 15 18:35:15 2014 +0900

    Add logging if downloading browscap fails

    Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>

commit 2963382fe291cb78529186db8ed6f5de1d2db5de
Merge: 8bb42dc 94025da
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Mon May 12 08:16:24 2014 +0200

    Merge pull request #1685 from Destreyf/patch-2

    Fixing "save_info" behavior on themes

commit 94025da50765e4f575e0019a56a25a97657e547f
Author: Destreyf <blasterjr@gmail.com>
Date:   Sat May 10 23:20:58 2014 -0600

    Fixing "save_info" behavior on themes

    When using save_info it actually writes the file into
fuel/app/config/{theme info filename} instead the respected theme's
directory, if you look at line 619 (load_info function) you'll notice it
passes array($theme) instead of array($theme['name']) this causes an
inconsistent behavior between reads and writes.

    This is applicable to 1.7.X as well.

commit 8bb42dcf5edaa6787516a22f1b1660a8ef34a98a
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri May 2 16:44:54 2014 +0200

    changed auto-format default to false, to prevent possible remote
execution vulnerability

commit cb04cee6e93995f03e9382f02cf8ef6255d5a862
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Apr 27 22:35:02 2014 +0200

    added native session emulation. related fuel/auth#73

commit 4851f0ea7d88703bc134f9ae671888a16eef9496
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Apr 27 21:49:33 2014 +0200

    fixed incorrect processing of empty XML tags; closes #1625

commit 13f497eecd9157080a8786de214449b6fdb8935d
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Apr 27 21:02:15 2014 +0200

    more flexible way of passing insert values; closes #1626

commit 3bf596002dabfe1c75ce30844111c93c974da8df
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Apr 27 20:06:00 2014 +0200

    added the option to import CSV data without headers; closes #1630

commit 6b35dce86a799e14671fa3ea9b23a947868b57e4
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Apr 27 19:01:25 2014 +0200

    unit tests for csv's without value enclosures; related #1650

commit 87cd66a5aa19ebdb9cd07a925c24f4cfeabf61d1
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Apr 27 18:53:36 2014 +0200

    added test for csv data without delimiter; fixed injected redundant
newline

commit a97e617d98713a451fc3bb9233cc31ae7d739126
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Apr 27 18:37:57 2014 +0200

    added support for csv files without value enclosures (like Excel
exports); closes #1650

commit a09cd6bf1b59ec2ad0b60dccd87ac0aa81ce7d32
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Apr 27 17:50:42 2014 +0200

    added match_collection() validation rule to match against a list of
valid values; closes #1655

commit 4921d075c6a67af351574e69c73067b017d30b28
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Apr 27 17:17:47 2014 +0200

    added list_collections() to Mongo_Db; closes #1675

commit 4d1e0bc1e6a97cca2d09a199e1f644e3e89b1138
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Apr 27 16:59:49 2014 +0200

    remove MySQL AUTOCOMMIT setting; Related #1679

    It's not needed, it ruins any autocommit value you have set
yourself,
    and it blocks manually locking of tables

commit 510c048cbf078ce55a1d07cbeea92765598c2868
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Apr 27 15:57:43 2014 +0200

    allow custom headers to be passed to to_csv(); closes #1611

commit b84e339a41109e5a7638615dea3b9a4dc41be3b6
Merge: f4099d9 a1298ba
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Sat Apr 26 14:34:09 2014 +0200

    Merge pull request #1610 from ose1955/1.8/develop

    Nested transaction feature.

commit f4099d945b970a0c7828dc6120ee97f2cd1d69f7
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sat Apr 26 14:27:48 2014 +0200

    reworked url suffixing; removed suffix length check; closes #1676

    today, valid suffixes can be very long, so there is no way to detect
    what is valid and what not. A suffix should not have a slash in it
    though.

commit bb5568cb393262cebaf82c4d1e4dc055a334184b
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sat Apr 26 13:29:18 2014 +0200

    corrected like() parameter definition and usage; closes #1672

commit 1698af0d0bc3f6943161997d4238d231207b1b43
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sat Apr 26 12:20:58 2014 +0200

    false is not a valid value for the required rule. closes #1668

commit 4084b3dabedda2b24d83900e125062ec0aa233ea
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sat Apr 26 00:12:46 2014 +0200

    add support for traits to the autoloader; optimized the code flow;
closes #1680

commit 01b69cabb4018dc6f80a59fbb75785f22590540e
Merge: dce6c91 872e7c7
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Thu Apr 24 22:53:03 2014 +0200

    Merge pull request #1637 from amalfra/patch-1

    Update php_fatal_error.php

commit dce6c91557c6cde83b147147b7bc6068123344a6
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Thu Apr 24 22:48:13 2014 +0200

    throw an exception of the autoloader finds the file, but it doesn't
contain the requested class. closes #1669

commit a1298bac248fa24fcc9b726b45bc565186ee3218
Author: Sergey Ogarkov <sogarkov@gmail.com>
Date:   Fri Apr 11 10:28:16 2014 +0300

    Fixing default in the DB rollback transaction

commit 075a060be4de9325cd855b6b1408335019a3b046
Author: Sergey Ogarkov <sogarkov@gmail.com>
Date:   Fri Apr 11 10:05:23 2014 +0300

    Fixing coding style

commit 2fdd79e0d902d78c081e472b086f551336b4663e
Merge: f86e9c5 0365cc8
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Tue Apr 8 20:27:12 2014 +0200

    Merge pull request #1673 from joni2back/patch-1

    Bugfix - Prevent infinite recursion

commit 0365cc8e36ecf27e07a10fc93b645d5e9543027a
Author: joni2back <joni2back@gmail.com>
Date:   Tue Apr 8 14:52:57 2014 -0300

    update ftp recursion fix

commit f86e9c593be2a342355d499907eb8988b1be4762
Merge: 916460a 4f665d5
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Tue Apr 8 19:40:45 2014 +0200

    Merge pull request #1660 from Art4/patch-1

    Unset a view variable through viewmodel

commit eb875491536ffa9ab26077a206fd847fd684bf1a
Author: joni2back <joni2back@gmail.com>
Date:   Tue Apr 8 11:20:30 2014 -0300

    Bugfix - Prevent infinite recursion

commit 916460aefaa0181db3892c9dd9b5da9df56a5b6c
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Mon Mar 24 20:46:53 2014 +0100

    implemented documented but missing format as named route param.
closes #1662

commit abf13761df556606e0546c6baa0eecb25a3d317b
Merge: c0256ac 869d0f8
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Mon Mar 24 20:29:39 2014 +0100

    Merge pull request #1665 from mikepmtl/patch-4

    Move into correct @package for phpdoc

commit c0256acd5a73bb86f3c12035c7c11af1253c535d
Merge: 500025f 5f217f3
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Mon Mar 24 20:28:53 2014 +0100

    Merge pull request #1663 from mikepmtl/patch-2

    Add class doc block with proper @package

commit 500025fcd4d2e30a0725d2d38f2ea0c17d60ebf3
Merge: 137c06c 9270c75
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Mon Mar 24 20:28:26 2014 +0100

    Merge pull request #1666 from mikepmtl/patch-5

    Wrong slash for phpdoc @category is deprecated

commit 9270c752c9ed0a125c99d03808b190363a9b05fc
Author: mikepmtl <mikepmtl@me.com>
Date:   Sun Mar 23 16:37:32 2014 -0400

    Wrong slash for phpdoc @category is deprecated

    See:
http://www.phpdoc.org/docs/latest/references/phpdoc/tags/category.html

commit 869d0f8e80087ace30db430e8f1994a4a5d9cb2c
Author: mikepmtl <mikepmtl@me.com>
Date:   Sun Mar 23 16:08:15 2014 -0400

    Move into correct @package for phpdoc

commit 5f217f3635ea120ee7a7f8ff7644f2635919cf12
Author: mikepmtl <mikepmtl@me.com>
Date:   Sun Mar 23 15:59:40 2014 -0400

    Add class doc block with proper @package

    It's making my phpdocs for my client look messy.  :)

commit 137c06c1425948ba3a54b4f931e25e97c313ae9a
Merge: 9d2e1c3 bd6380e
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Sun Mar 23 09:35:35 2014 +0100

    Merge pull request #1661 from mikepmtl/patch-1

    slash and backslash in valid_string validation

commit bd6380efe6b4f69b063e041f82bf4a524f1138e8
Author: mikepmtl <mikepmtl@me.com>
Date:   Sat Mar 22 19:51:16 2014 -0400

    slash and backslash in valid_string validation

    Used frequently in URI's and file paths.

commit 9d2e1c3040625996ae34073f26d76b38b84ca4cc
Merge: 6b5e198 06e8395
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Thu Mar 20 16:21:29 2014 +0100

    Merge pull request #1658 from jhuriez/1.8/develop

    #1656 make sure it uses forward slashes on Windows

commit 6b5e198553e89e07c5016a3a013df7967d5dc26d
Merge: b55d66d 17e6e50
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Thu Mar 20 16:17:39 2014 +0100

    Merge pull request #1659 from sebesvn/1.6/develop

    fixing class name comparison in SSH2.php

commit 4f665d575729092817c5f5fbe8a60819f687e290
Author: Art4 <Art4@users.noreply.github.com>
Date:   Wed Mar 19 20:00:55 2014 +0100

    Unset a view variable through viewmodel

commit 17e6e50b211cc0ad9c90d11fdee7688810057252
Author: sebesvn <systemseb@gmail.com>
Date:   Wed Mar 19 11:48:49 2014 +0100

    fixing class name comparison in SSH2.php

commit 06e8395c030c1aedf41e9f70e9816e64a6e51364
Author: Julien Huriez <syntaxlb@gmail.com>
Date:   Wed Mar 19 09:33:28 2014 +0100

    make sure it uses forward slashes on Windows

commit b55d66d610da1f3e752db550f603d34ee24159d8
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Tue Mar 18 18:16:25 2014 +0100

    fixed typo in PHPSecLib

    see https://github.com/phpseclib/phpseclib/issues/20

commit 6e15b9cc970a605907afcb9b1e6fc6f06ea83ffb
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sat Mar 15 15:54:44 2014 +0100

    add the charset to the dsn if not present; closes fuel/fuel295

commit b53587f1e765bbe8492fca31527aba36da3455e3
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sat Mar 15 10:52:47 2014 +0100

    fixed broken multibyte support in Str::truncate. closes #1653

commit 92cce8c0bca9276887b717e0e510c1c5edf36f5a
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Thu Mar 13 17:39:05 2014 +0100

    fixed broken tests after debug output changes, closes #1652

commit 5bde9e56464823185e2eadd6853c1d4fd4e52dde
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Mar 9 00:24:31 2014 +0100

    Improve cli backtrace. closes #1634

    rewrite due to coding standard violations and lack of response from
the
    PR author. also added missing new config key

commit 8a751a1a654abdea6ff22643ce2c1e806c53cbf8
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Mar 9 00:08:34 2014 +0100

    avoid deadlocks which empty cache files, closes #1632

    this should not happen, but just in case...

commit f5e40218f3e550714c67677ef71f8d1cc9e7a9d5
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sat Mar 8 23:57:34 2014 +0100

    make sure html_tag() generates compliant HTML. closes #1616

    modified due to lack of response of the original PR author.

commit ec532118f3737bffb30750d316a062e692acf87a
Merge: bdb201c 8c0ccb1
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Sat Mar 8 23:18:15 2014 +0100

    Merge pull request #1651 from CodeYellowBV/1.8/develop

    fix #1649

commit bdb201ccba0e7d996dead37e78d83654cf5559f2
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sat Mar 8 23:14:54 2014 +0100

    some log cleanup. related #1648

commit 216d119ba1405794322ad9caec6f96681fe7eecd
Merge: 8399fd3 3f37f6f
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Sat Mar 8 23:10:46 2014 +0100

    Merge pull request #1648 from MyMedia/1.8/develop

    \Log::_init() - Extended determinig name and location of logfile by
new ...

commit 8c0ccb1894b23bd4a2f3d1ff2e80b25b4e53e672
Author: burhan <burhan@r2d2.(none)>
Date:   Sat Mar 8 20:16:43 2014 +0100

    fix #1649

    Fix for removal of staticExpects in PHPUnit 4 by introducing
    Test_Router_Mock.

commit 3f37f6fdd10db46194a2a593777b96b3353b6447
Author: Kristián Feldsam <feldsam@gmail.com>
Date:   Sat Mar 8 14:01:56 2014 +0100

    Added "log_filename" entry to config. REFS #1648

    Signed-off-by: Kristián Feldsam <feldsam@gmail.com>

commit 1b8de411dfc7a24ac64b0b90a1800d80b1d4db6a
Author: Kristián Feldsam <feldsam@gmail.com>
Date:   Thu Mar 6 18:08:58 2014 +0100

    \Log::_init() - Extended determinig name and logation of logfile by
new config "log_filename"

    log_filename = 'fuelphp.log' - for loging is used only this one file
in log_path dir.
    log_filename = null - use original way

    I made this extension, because I want use linux logrotation

    Signed-off-by: Kristián Feldsam <feldsam@gmail.com>

commit 8399fd38c72d329a7ba27fa83090f6ed40ba6aa4
Author: Frank de Jonge <info@frenky.net>
Date:   Thu Mar 6 11:39:28 2014 +0100

    Use Uri::main as the default action in Form::open

commit c02ac31f2cc5ff502b4a4b0f58791e413302785e
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Wed Mar 5 20:55:13 2014 +0100

    check if gzip is accepted before enabling it; take the output
handler setting into account after profiling

commit fe75f8b0ac3c42b9082b5bd0d740c65ceb94b7f6
Merge: 7397ae6 da396d4
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Wed Mar 5 14:59:23 2014 +0100

    Merge pull request #1645 from CodeYellowBV/1.8/develop

    Added unit test for Router to check for correctly finding controller

commit 7397ae6fc03c090183cc5fe4908eb46ade4a2d9d
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Wed Mar 5 11:27:18 2014 +0100

    Correctly setup the active request too

commit da396d4fbb8a3f595f27dea71c43dc4fc7c0e833
Author: Burhan Zainuddin <burhan@codeyellow.nl>
Date:   Wed Mar 5 10:11:07 2014 +0100

    Added unit test for Router to check for correctly finding controller
    whether using underscores or namespaces. Two function are
    added to ease testing.

commit 699504a1d4bb0170a40be63e954d5da9dca800a7
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Wed Mar 5 11:07:09 2014 +0100

    fixed broken lang file load order; closes #1644

commit 3e1a45af4d908f5468ad2320d79ed43093fb88bb
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Wed Mar 5 10:54:25 2014 +0100

    check all other locations before checking the URI for a session id

commit ab60e8c46fbe1a1db58f4a1dc8c011d1dae2e119
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Wed Mar 5 10:53:53 2014 +0100

    added logging to the session, to aid in debugging session loss

commit 1880c5dbedb4c60717154778bee69040e4c5d557
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Wed Mar 5 10:42:31 2014 +0100

    if no or an empty action is passed, use the active request Uri.
Closes #1643

commit 2548720d882a321124f483357f6067b63c732419
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Mon Mar 3 08:42:43 2014 +0100

    make sure get_browser() uses our agent string, not the system one.

commit b7a39a091c082d7833a6d5a031eed49cf29a45cf
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Mar 2 09:27:26 2014 +0100

    Fixed incorrect enumeration of fieldset fields, closes #1642

commit a410d2681de2394cbb41a2365e279cdc0f55683e
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Mar 2 09:18:48 2014 +0100

    empty string is a valid uri for Uri::create(). Closes #1641

commit fc60fb0d0832be05981ffa63cbd3d2810ddc19a7
Merge: 3eccec7 96eb8d4
Author: Frank de Jonge <info@frenky.net>
Date:   Thu Feb 20 18:24:34 2014 +0100

    Merge pull request #1639 from tominon/patch-1

    Fix incorrect status code (#1638)

commit 96eb8d47e19e67455fc39b2e75665bcd62180f15
Author: Tom <tominon@users.noreply.github.com>
Date:   Thu Feb 20 17:22:25 2014 +0100

    Fix incorrect status code (#1638)

commit 872e7c7e0910a7ab5347b3c171e1d1d6ad082ccc
Author: Amal Francis <amalfra@gmail.com>
Date:   Thu Feb 20 21:14:34 2014 +0530

    Update php_fatal_error.php

    A tiny border to wrapper. I think it would look the php fatal error
view look bit better....

commit 3eccec7f406f2a14e592157a907cea2566aeef8c
Merge: 6e82322 9335881
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Thu Feb 20 16:40:52 2014 +0100

    Merge pull request #1636 from Savageman/patch-9

    Escape double quotes inside property value

commit 6e82322954e03c0de0ced1b19ac8d9061f60630a
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Thu Feb 20 16:35:03 2014 +0100

    additional unit tests for csv parsing and generation

commit 9e36af0080048f8cffc9a8b06d80c89279edb822
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Thu Feb 20 16:34:41 2014 +0100

    fixed incorrect csv parsing and generation

commit 53338aaa7e10dabfa8f1798c4d8bcf6932cafe22
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Thu Feb 20 16:34:07 2014 +0100

    fixed incorrect csv format defaults

commit 933588181996bb18f359891b9eec64109b076e3c
Author: Julian Esperat <esperat@novius.fr>
Date:   Thu Feb 20 15:40:54 2014 +0100

    Escape double quotes inside property value

commit 87c29f4ccc1efdd737d8230f53f6ec1de9c9359d
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Wed Feb 19 22:48:14 2014 +0100

    newline should be in double quotes

commit 77e409e188804287ad8db7b3913be8f5f54b9b57
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Wed Feb 19 22:38:23 2014 +0100

    fixed parsing CSV strings

commit d50ac7ecc4ab4216e6b3654525c00a6d8f5ac882
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Mon Feb 17 15:23:50 2014 +0100

    tests for Arr::keyval_to_assoc

commit 2c2c24f37f0cab4166ce4882a5edf590fb4ad703
Merge: 0153aeb 63c5047
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Mon Feb 17 15:04:40 2014 +0100

    Merge pull request #1631 from sagikazarmark/1.8/develop

    Added Arr::keyval_to_assoc

commit 0153aeb80188f4c7ac71c96d8935420310806ae9
Merge: 96b5de2 6dc9d6b
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Mon Feb 17 15:03:07 2014 +0100

    Merge pull request #1635 from propcom/asset-finding-refix

    selectively remove DOCROOT from asset file, depending on use

commit 6dc9d6b84679dc744cc429ce14d36e451a510210
Author: Alastair McGowan-Douglas <alastair@propcom.co.uk>
Date:   Mon Feb 17 12:42:34 2014 +0000

    Remove DOCROOT /after/ stat

commit 8e2b1bdcd97fed1ad95d81237437bdc4a9035291
Author: Alastair McGowan-Douglas <alastair@propcom.co.uk>
Date:   Mon Feb 17 12:29:06 2014 +0000

    selectively remove DOCROOT from asset file, depending on use

commit 63c5047f6daad6086f02da093ac07ee6d4c7bed3
Author: Sági-Kazár Márk <mark.sagikazar@gmail.com>
Date:   Fri Feb 14 18:42:23 2014 +0100

    Renamed variable, as it was confusing

commit 96b5de297c8779b1c91427bfe5df748eae766365
Merge: 3d5dab3 81880d7
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Fri Feb 14 17:47:36 2014 +0100

    Merge pull request #1633 from propcom/bugfix-asset-finding

    Ensure the asset we found stays as a disk path until render

commit 81880d7ffea3341fc91d88a002a817960c6b9451
Author: Alastair McGowan-Douglas <alastair@propcom.co.uk>
Date:   Fri Feb 14 11:58:24 2014 +0000

    Ensure the asset we found stays as a disk path until render

commit 97dada6176b42cdd149f98ad3f3c503207d6c058
Author: Sági-Kazár Márk <mark.sagikazar@gmail.com>
Date:   Thu Feb 13 10:17:49 2014 +0100

    Added Arr::keyval_to_assoc

commit 3d5dab33b9485660450c97533fbf538bb707c5bc
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Tue Feb 11 21:21:13 2014 +0100

    fixed using the wrong variable; related #1621

commit 215cb43f50f188b7336d62cb363e4dae30dfe811
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Mon Feb 10 15:34:52 2014 +0100

    added File::exists(), a file exist check that honours the defined
area. closes #1621

commit a9451f3f013bc40e09b7738489c2fbb0a2d30962
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Mon Feb 10 08:01:23 2014 +0100

    added the option to delete the file after download; related #1621

commit 54540e0700473e73c0c5f72da6c560eaaa28744a
Merge: 14b151b c9e9f2a
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Sat Feb 8 11:29:48 2014 +0100

    Merge pull request #1628 from MyMedia/1.8/develop

    DBUtil::rename_table() fixed table prefix of new table name based on
db ...

commit c9e9f2aa6af92414cc51a858ce09f28772366bdf
Author: Kristián Feldsam <feldsam@gmail.com>
Date:   Thu Feb 6 23:23:49 2014 +0100

    DBUtil::rename_table() fixed table prefix of new table name based on
db connection.

    Signed-off-by: Kristián Feldsam <feldsam@gmail.com>

commit 14b151b34f559062632ea57ff2521ef26e188e78
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Thu Feb 6 00:01:08 2014 +0100

    reverted the date change. bad idea!

commit 7668e2e376bdb650773751ac22695246ba24284f
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Wed Feb 5 17:59:34 2014 +0100

    removed date range restriction for 32-bit systems

commit 04c5544aed7b54c2668847c962d97ef4bddd5c68
Merge: 8e3f9bf 440a103
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Sat Feb 1 01:06:04 2014 -0800

    Merge pull request #1623 from pachico/patch-2

    Htmlentities for row data

commit 8e3f9bf283cfcc6925bca827a4b8a63fef23d687
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Wed Jan 29 18:06:46 2014 +0100

    added opcode cache detection to Lang and Config save() methods.
closes #1580

commit 440a1034d17868c49181ec96832f8d66a7e04372
Author: Mariano Benítez Mulet <pachicospam@gmail.com>
Date:   Tue Jan 28 15:41:00 2014 +0100

    Htmlentities for row data

    At representation level, row data should be
"\Security::htmlentitized" since data could contain html codes.
    Example: if you try to log "&currency=EUR", quick profiler will
display "¤cy=EUR".

commit c9f02cdfa9cb3f1cea356be4ce5a3a19c3c5b3a2
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Mon Jan 27 18:35:57 2014 +0100

    deal with possible chmod rights issues

commit 478ba0c0140e740cb63ed23e4a659adc8985745b
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Jan 26 14:25:38 2014 +0100

    browscap.org is back, switch back to the correct URL's. Closes #1620

commit d23a9783635c231a2fc14008715cbff43660a85c
Merge: 696e458 289628d
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Fri Jan 24 06:48:47 2014 -0800

    Merge pull request #1618 from umireon/input_content_type_length

    fixed Content-Type and Content-Length for FCGI and NGINX setup

commit 289628d48f21e0088f0f1c320ca037079d21f23d
Author: Udagawa Kaito <umireon@gmail.com>
Date:   Fri Jan 24 23:37:28 2014 +0900

    Content-Type and Length for dash and underscore

    Signed-off-by: Udagawa Kaito <umireon@gmail.com>

commit 4dd9381e23cefe3fc796f79d490428c8bb3d4b6a
Author: Udagawa Kaito <umireon@gmail.com>
Date:   Fri Jan 24 15:01:12 2014 +0900

    fixed Content-Type and Content-Length for FCGI and NGINX setup

    Signed-off-by: Udagawa Kaito <umireon@gmail.com>

commit 696e458989a13b97569f759b7a596a86865b95de
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Thu Jan 16 20:12:40 2014 +0100

    don't hide the connection error message; related #1613

commit ecef4845f84f2811997e8f96ac7c81d157af6efd
Merge: 1cbd037 30bb9e1
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Thu Jan 16 10:54:44 2014 -0800

    Merge pull request #1614 from felixgilles/pr/export_format

    Php config-> export format () modifies the content values

commit 30bb9e1927700d8922804ebf5d1d77d47edb7b06
Author: Gilles FELIX <felix@novius.com>
Date:   Thu Jan 16 08:53:02 2014 +0100

    Php config-> export format () modifies the content values

commit dd335cf418f7c22a46d280c908347d2a74d91066
Author: Sergey Ogarkov <sogarkov@gmail.com>
Date:   Tue Jan 14 16:12:45 2014 +0200

    Nested transactions: SAVEPOINTS were added. Namespace fixed

commit 220444f9409a5c64c9d60adaca7ac447582f17c6
Author: Sergey Ogarkov <sogarkov@gmail.com>
Date:   Tue Jan 14 16:09:02 2014 +0200

    Nested transactions: SAVEPOINTS were added.

commit 9a6c40353cb804077857abb17fe01d79b688a3fe
Author: Sergey Ogarkov <sogarkov@gmail.com>
Date:   Tue Jan 14 15:59:14 2014 +0200

    Nested transactions: SAVEPOINTS were added.

commit efbd62840527a32ec809e57cce0a397ff619f0c8
Author: Sergey Ogarkov <sogarkov@gmail.com>
Date:   Sun Jan 12 10:33:00 2014 +0200

    Nested transastion feature. Very small but very useful. Only first
level is the real start/commit. All nested transactions only
increment/decrement the transaction depth level counter. Rollback resets
a counter and rollbacks the transaction.

commit 1cbd03720b8b0bcb353cfb1278c51c3693c272d1
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri Jan 10 08:40:39 2014 +0100

    fixed pagination tests

commit 8f4c14cc19a4e89e4a47f4a58e94233c19e2e2ec
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Thu Jan 9 21:49:00 2014 +0100

    added support for fully namespaced controllers

    now you can use Controller\Foo\Bar, Controller_Foo_Bar, and
    Controller\Foo_Bar

commit b6e22b2359ccf0ed5bc08bf642772686fb36a0e6
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Wed Jan 8 15:28:27 2014 +0100

    use &amp; to separate variables in the query string. closes #1608

commit d72fd92b3c3194ef818345f75fd0b9f19f404579
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Tue Jan 7 17:14:00 2014 +0100

    better processing of the returned auth digest string; closes #1607

commit d6b4dfe32f278cbd00dd93503167ab10863f77b9
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri Jan 3 16:54:01 2014 +0100

    fixed BC, broken in cd9260fc42345854d948a8752137eafadd32168c

commit a3d9295783cb239c4471b65755d422d5bf916329
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri Dec 27 13:05:51 2013 +0100

    bumped the copyright to 2014

commit 51226cc615f48e22e30ccfe1665497f3f0c32f43
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Thu Dec 26 17:11:25 2013 +0100

    fixed notice error due to incorrect config key. closes #1605

commit b77560cb04204764090b0be76b03ff1f2859a0db
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Tue Dec 24 19:01:12 2013 +0100

    class properties should never be private. closes #1603

commit 07c4b1840e8508f8f48203ccf434c48b4958d75b
Merge: f9c7235 ccb1591
Author: Frank de Jonge <info@frenky.net>
Date:   Tue Dec 24 00:23:04 2013 -0800

    Merge pull request #1602 from iturgeon/1.8/develop

    Error concerning session.http_header_name configuration

commit ccb15918fa9fa51137af0ff745633a3afe2f55a0
Author: Ian Turgeon <iturgeon@gmail.com>
Date:   Mon Dec 23 00:18:33 2013 -0500

    Fixes a error concerning session.http_header_name configuration
usage

    Signed-off-by: Ian Turgeon <iturgeon@gmail.com>

commit f9c72356a98f0f9da51f99d1d07f940d6e5b556d
Merge: 2b8aa80 90acde9
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Sun Dec 22 09:24:17 2013 -0800

    Merge pull request #1601 from SlKelevro/db-connection-name-in-
profiler

    Added db connection name to profiler output

commit 90acde939966bc2daf4a36671f17e3579dfff17d
Author: SlKelevro <SlKelevro@gmail.com>
Date:   Sun Dec 22 16:50:31 2013 +0200

    added database connection to profiler output

commit 2b8aa801936d4f47f3a1ea7a8480872119815c48
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri Dec 20 18:12:59 2013 +0100

    added missing config file extension

commit 56a2ad3b1d1f63c4aaed389b9cdb4d7c32779d09
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Dec 15 23:37:43 2013 +0100

    added input validation to pagination

commit d915aced3f66a55a8a931df0d0f5992372e56167
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Dec 15 15:57:54 2013 +0100

    added pagination link offset; fixed pagination tests

commit 00fe10120ad5dd3ba6c5a384bc3ac63a1058205b
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri Dec 13 16:35:54 2013 +0100

    second attempt at fixing pagination start/end calculation

commit c3b9c7e42b6f1df463275d4fee145900a17c3d53
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri Dec 13 15:40:20 2013 +0100

    fixed pagination start page calculation

commit 1a75be0342834bf24b72382c0b1306cb8fabcf0f
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Thu Dec 12 22:23:48 2013 +0100

    remove the limitation on separator selection. related fuel/orm#324

commit 748d59869f2d08d744d74471dcb35cd71c189c1a
Merge: 11c982d 6229d03
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Thu Dec 12 12:11:17 2013 -0800

    Merge pull request #1598 from felixgilles/pr/chmod_on_config_files

    Apply chmod on every Config_File->save(), remove specific chmod on
crypt config

commit 11c982d87ca18f9df05a6d84dfb13a0f28724eae
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Thu Dec 12 12:02:56 2013 +0100

    when the key passed is an object, cast it to string

commit 6229d038d43f66df9432a59185c89afaa0952f0c
Author: Gilles FELIX <felix@novius.com>
Date:   Thu Dec 12 09:39:21 2013 +0100

    Apply chmod on every Config_File->save(), remove specific chmod on
crypt config

commit 29a150c9a874e26bd518ba1a36c7f26006676011
Merge: 5f25b0c 9385bb0
Author: Frank de Jonge <info@frenky.net>
Date:   Wed Dec 11 09:23:49 2013 -0800

    Merge pull request #1597 from laurent35240/1.8/develop

    Fix Using AFTER and COMMENT in correct order in DBUtil

commit 9385bb0e1fb9f58ae5a7af90bcd0589aa352db61
Author: Laurent Clouet <lct@myfox.fr>
Date:   Wed Dec 11 17:51:12 2013 +0100

    Fix Using AFTER and COMMENT in correct order in DBUtil

commit 5f25b0c33f6a420c08d91c612406bad1057dcca7
Author: Frank de Jonge <info@frenky.net>
Date:   Mon Dec 9 19:48:52 2013 +0100

    Fixes #1596: Use quote for DBUtil::process_fields default value

commit 6a8d3e7334d40d94cc499e7aba549a6737209f5a
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sat Dec 7 13:05:03 2013 +0100

    removed Markdown; switched to the Markdown composer package; closes

    don't forget to update your composer.json and run a composer update!

commit 10b803bea8d4da7557e8bb056299e01c11e8cf08
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Thu Dec 5 12:58:31 2013 +0100

    return the empty content in the format specified when encountering a
204 NO CONTENT situation

commit 8950afa42659500854f7df79535bccfa4193f10a
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Wed Dec 4 15:12:15 2013 +0100

    swap csv config value retrieval, to provide proper fallback to
pre-1.7 config. closes #1594

commit c753931eeab5b0f4b71d461d045dde3605098acc
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Tue Dec 3 11:48:23 2013 +0100

    reordered the way the autoloaders are loaded

commit 637f9f9a5b86209cbc2ca8407ef0333a05052a0e
Merge: 6cdc88a bef6a10
Author: Frank de Jonge <info@frenky.net>
Date:   Tue Dec 3 11:01:18 2013 +0100

    Merge branch '1.8/develop' of github.com:fuel/core into 1.8/develop

commit 6cdc88a6845c1245daaa3b527d29fe516f5145b8
Author: Frank de Jonge <info@frenky.net>
Date:   Tue Dec 3 10:59:25 2013 +0100

    Removed whitespace before php

commit bef6a10c302917c4b4992b7267093eaf9218dcf2
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Tue Dec 3 10:35:57 2013 +0100

    removed leading space

commit fc2b8e09f2f334479b27c7bdc1b8675ebf23b63e
Author: Frank de Jonge <info@frenky.net>
Date:   Tue Dec 3 10:31:18 2013 +0100

    Fixes #1593, simple corrections should also be tested.

commit 904a0e308057f23c6263e4be588816b4b4490095
Merge: 9143d7a 3cf2ccc
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Mon Dec 2 23:24:16 2013 -0800

    Merge pull request #1592 from ka2n/session_cookie_domain_path

    When destroying the session cookie, consider cookie domain and path.

commit 9143d7ac9038e152ec2f38539bfd3a9d1f95286e
Merge: 7c54729 6bf0446
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Mon Dec 2 23:23:26 2013 -0800

    Merge pull request #1591 from kenjis/fix_json

    Fix config path for json encode options

commit 3cf2ccc27a0b37bd665d9b9e2892597c1a2f7912
Author: Katsuma Ito <katsumai@gmail.com>
Date:   Tue Dec 3 10:24:43 2013 +0900

    When destroying the session cookie, consider cookie domain and path.

    This fix the problem the session cookie aren't deleted if cookie
domain and path has set.

commit 6bf04464bcdde932c91098d1d19000f727e69b53
Author: kenjis <kenji.uui@gmail.com>
Date:   Tue Dec 3 09:46:48 2013 +0900

    Fix config path for json encode options

    Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>

commit 7c5472961b5288e1ffb4441a336772736904ce32
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Mon Dec 2 23:02:16 2013 +0100

    fixed state not reset when using set_flash on an existing expired
flash variable

commit e7d9ff32e272afc14b3653c0929bc40410493411
Merge: 3ccecfa 1007691
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Mon Dec 2 11:26:01 2013 -0800

    Merge pull request #1590 from Savageman/patch-8

    Fix XSS in phpquickprofiler

commit 1007691d71562432b9964e41402c5334bbf09be4
Author: Julian Esperat <esperat@novius.fr>
Date:   Mon Dec 2 18:27:50 2013 +0100

    Fix XSS in phpquickprofiler

commit 3ccecfa31c46b05fd82ba31d4d0f7905fc8061b7
Author: Frank de Jonge <info@frenky.net>
Date:   Mon Dec 2 18:24:58 2013 +0100

    Reverting to isset only on __isset as is expected of the isset
function.

commit bc185feb523778fdf8148f70397906777eda666c
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Mon Dec 2 14:03:38 2013 +0100

    fixed broken property check for properties with a null value; closes

commit 8b6df4b7f26be3e14bb5d1afa11e6f7a1fcf69f8
Merge: 9e4903d 30c043c
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Sun Dec 1 08:36:29 2013 -0800

    Merge pull request #1588 from tominon/patch-1

    Fix config path for json encode options

commit 9e4903d2f18fc90a342d7df00abd2df3203a7eee
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Dec 1 16:43:16 2013 +0100

    deal with methods returning objects that can't be cast to string

commit 30c043c2a18bba5467782d639a27d88e41586dde
Author: Tom <tominon@gmail.com>
Date:   Sun Dec 1 16:38:31 2013 +0100

    Fix config path for json encode options

commit cd9260fc42345854d948a8752137eafadd32168c
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sun Dec 1 16:27:26 2013 +0100

    deal with array responses on non-restful requests
  • Loading branch information
@WanWizard
WanWizard committed Jul 13, 2014
1 parent 8711862 commit 22c047f
Show file tree
Hide file tree
Showing 273 changed files with 23,158 additions and 8,971 deletions.
3 changes: 3 additions & 0 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Please read the project contibuting guidelines before creating an issue of sending in a pull request:

https://github.com/fuel/fuel/wiki/Contributing
39 changes: 31 additions & 8 deletions base.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2013 Fuel Development Team
* @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/

Expand All @@ -22,8 +22,12 @@
function import($path, $folder = 'classes')
{
$path = str_replace('/', DIRECTORY_SEPARATOR, $path);
require_once COREPATH.$folder.DIRECTORY_SEPARATOR.$path.'.php';

// load it ffrom the core if it exists
if (is_file(COREPATH.$folder.DIRECTORY_SEPARATOR.$path.'.php'))
{
require_once COREPATH.$folder.DIRECTORY_SEPARATOR.$path.'.php';
}
// if the app has an override (or a non-core file), load that too
if (is_file(APPPATH.$folder.DIRECTORY_SEPARATOR.$path.'.php'))
{
require_once APPPATH.$folder.DIRECTORY_SEPARATOR.$path.'.php';
Expand Down Expand Up @@ -126,7 +130,7 @@ function array_to_attr($attr)
$property = $value;
}

$attr_str .= $property.'="'.$value.'" ';
$attr_str .= $property.'="'.str_replace('"', '&quot;', $value).'" ';
}

// We strip off the last space for return
Expand All @@ -146,12 +150,31 @@ function array_to_attr($attr)
{
function html_tag($tag, $attr = array(), $content = false)
{
$has_content = (bool) ($content !== false and $content !== null);
$html = '<'.$tag;
// list of void elements (tags that can not have content)
static $void_elements = array(
// html4
"area","base","br","col","hr","img","input","link","meta","param",
// html5
"command","embed","keygen","source","track","wbr",
// html5.1
"menuitem",
);

// construct the HTML
$html = '<'.$tag;
$html .= ( ! empty($attr)) ? ' '.(is_array($attr) ? array_to_attr($attr) : $attr) : '';
$html .= $has_content ? '>' : ' />';
$html .= $has_content ? $content.'</'.$tag.'>' : '';

// a void element?
if (in_array(strtolower($tag), $void_elements))
{
// these can not have content
$html .= ' />';
}
else
{
// add the content and close the tag
$html .= '>'.$content.'</'.$tag.'>';
}

return $html;
}
Expand Down
18 changes: 16 additions & 2 deletions bootstrap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2013 Fuel Development Team
* @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/

Expand Down Expand Up @@ -42,6 +42,13 @@
// reset the autoloader
\Autoloader::_reset();

// if we have sessions loaded, and native session emulation active
if (\Config::get('session.native_emulation', false))
{
// close the name session
session_id() and session_write_close();
}

// make sure we're having an output filter so we can display errors
// occuring before the main config file is loaded
\Config::get('security.output_filter', null) or \Config::set('security.output_filter', 'Security::htmlentities');
Expand All @@ -62,6 +69,10 @@
\Cli::beep();
exit(1);
}
else
{
logger(\Fuel::L_ERROR, 'shutdown - ' . $e->getMessage()." in ".$e->getFile()." on ".$e->getLine());
}
}
return \Error::shutdown_handler();
});
Expand Down Expand Up @@ -124,6 +135,7 @@ function setup_autoloader()
'Fuel\\Core\\Cache_Storage_File' => COREPATH.'classes/cache/storage/file.php',
'Fuel\\Core\\Cache_Storage_Memcached' => COREPATH.'classes/cache/storage/memcached.php',
'Fuel\\Core\\Cache_Storage_Redis' => COREPATH.'classes/cache/storage/redis.php',
'Fuel\\Core\\Cache_Storage_Xcache' => COREPATH.'classes/cache/storage/xcache.php',

'Fuel\\Core\\Config' => COREPATH.'classes/config.php',
'Fuel\\Core\\ConfigException' => COREPATH.'classes/config.php',
Expand Down Expand Up @@ -251,6 +263,8 @@ function setup_autoloader()

'Fuel\\Core\\Pagination' => COREPATH.'classes/pagination.php',

'Fuel\\Core\\Presenter' => COREPATH.'classes/presenter.php',

'Fuel\\Core\\Profiler' => COREPATH.'classes/profiler.php',

'Fuel\\Core\\Request' => COREPATH.'classes/request.php',
Expand Down Expand Up @@ -301,6 +315,6 @@ function setup_autoloader()
'Fuel\\Core\\Validation_Error' => COREPATH.'classes/validation/error.php',

'Fuel\\Core\\View' => COREPATH.'classes/view.php',
'Fuel\\Core\\ViewModel' => COREPATH.'classes/viewmodel.php',
'Fuel\\Core\\Viewmodel' => COREPATH.'classes/viewmodel.php',
));
};
35 changes: 35 additions & 0 deletions bootstrap_phpunit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,41 @@
defined('FUEL_START_TIME') or define('FUEL_START_TIME', microtime(true));
defined('FUEL_START_MEM') or define('FUEL_START_MEM', memory_get_usage());

// Load the Composer autoloader if present
defined('VENDORPATH') or define('VENDORPATH', realpath(COREPATH.'..'.DS.'vendor').DS);
if ( ! is_file(VENDORPATH.'autoload.php'))
{
die('Composer is not installed. Please run "php composer.phar update" in the project root to install Composer');
}
require VENDORPATH.'autoload.php';

if (class_exists('AspectMock\Kernel'))
{
// Configure AspectMock
$kernel = \AspectMock\Kernel::getInstance();
$kernel->init(array(
'debug' => true,
'appDir' => __DIR__.'/../',
'includePaths' => array(
APPPATH, COREPATH, PKGPATH,
),
'excludePaths' => array(
APPPATH.'tests', COREPATH.'tests',
),
'cacheDir' => APPPATH.'tmp/AspectMock',
));

// Load in the Fuel autoloader
$kernel->loadFile(COREPATH.'classes'.DIRECTORY_SEPARATOR.'autoloader.php');
}
else
{
// Load in the Fuel autoloader
require COREPATH.'classes'.DIRECTORY_SEPARATOR.'autoloader.php';
}

class_alias('Fuel\\Core\\Autoloader', 'Autoloader');

// Boot the app
require_once APPPATH.'bootstrap.php';

Expand Down
11 changes: 6 additions & 5 deletions classes/agent.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2013 Fuel Development Team
* @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/

Expand Down Expand Up @@ -96,7 +96,7 @@ class Agent
protected static $defaults = array(
'browscap' => array(
'enabled' => true,
'url' => 'http://tempdownloads.browserscap.com/stream.asp?Lite_PHP_BrowsCapINI',
'url' => 'http://browscap.org/stream?q=Lite_PHP_BrowsCapINI',
'method' => 'wrapper',
'file' => '',
),
Expand Down Expand Up @@ -193,7 +193,7 @@ public static function _init()
if (static::$user_agent)
{
// try the build in get_browser() method
if (ini_get('browscap') == '' or false === $browser = get_browser(null, true))
if (ini_get('browscap') == '' or false === $browser = get_browser(static::$user_agent, true))
{
// if it fails, emulate get_browser()
$browser = static::get_from_browscap();
Expand Down Expand Up @@ -424,7 +424,7 @@ protected static function parse_browscap()
case 'local':
if ( ! is_file(static::$config['browscap']['file']) or filesize(static::$config['browscap']['file']) == 0)
{
throw new \Exception('Agent class: could not open the local browscap.ini file.');
throw new \Exception('Agent class: could not open the local browscap.ini file: '.static::$config['browscap']['file']);
}
$data = @file_get_contents(static::$config['browscap']['file']);
break;
Expand Down Expand Up @@ -456,6 +456,7 @@ protected static function parse_browscap()
}
catch (\ErrorException $e)
{
logger(\Fuel::L_ERROR, 'Failed to download browscap.ini file.', 'Agent::parse_browscap');
$data = false;
}
default:
Expand All @@ -475,7 +476,7 @@ protected static function parse_browscap()
}
catch (\Exception $e)
{
logger(\Fuel::L_ERROR, 'Failed to download browscap.ini file.', 'Agent::parse_browscap');
logger(\Fuel::L_ERROR, 'Failed to get the cache of browscap.ini file.', 'Agent::parse_browscap');
}
}
else
Expand Down
32 changes: 31 additions & 1 deletion classes/arr.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2013 Fuel Development Team
* @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/

Expand Down Expand Up @@ -53,6 +53,8 @@ public static function get($array, $key, $default = null)
return $return;
}

is_object($key) and $key = (string) $key;

if (array_key_exists($key, $array))
{
return $array[$key];
Expand Down Expand Up @@ -247,6 +249,34 @@ public static function assoc_to_keyval($assoc, $key_field, $val_field)
return $output;
}

/**
* Converts an array of key => values into a multi-dimensional associative array with the provided field names
*
* @param array $array the array to convert
* @param string $key_field the field name of the key field
* @param string $val_field the field name of the value field
* @return array
* @throws \InvalidArgumentException
*/
public static function keyval_to_assoc($array, $key_field, $val_field)
{
if ( ! is_array($array) and ! $array instanceof \Iterator)
{
throw new \InvalidArgumentException('The first parameter must be an array.');
}

$output = array();
foreach ($array as $key => $value)
{
$output[] = array(
$key_field => $key,
$val_field => $value
);
}

return $output;
}

/**
* Converts the given 1 dimensional non-associative array to an associative
* array.
Expand Down
2 changes: 1 addition & 1 deletion classes/asset.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2013 Fuel Development Team
* @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/

Expand Down
25 changes: 17 additions & 8 deletions classes/asset/instance.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
* @copyright 2010 - 2013 Fuel Development Team
* @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/

Expand Down Expand Up @@ -74,6 +74,11 @@ class Asset_Instance
*/
protected $_fail_silently = false;

/**
* @var bool if true, will always true to resolve assets. if false, it will only try to resolve if the asset url is relative.
*/
protected $_always_resolve = false;

/**
* Parse the config and initialize the object instance
*
Expand Down Expand Up @@ -103,11 +108,12 @@ public function __construct($config)
}
}

$this->_add_mtime = $config['add_mtime'];
$this->_add_mtime = (bool) $config['add_mtime'];
$this->_asset_url = $config['url'];
$this->_indent = str_repeat($config['indent_with'], $config['indent_level']);
$this->_auto_render = $config['auto_render'];
$this->_fail_silently = $config['fail_silently'];
$this->_auto_render = (bool) $config['auto_render'];
$this->_fail_silently = (bool) $config['fail_silently'];
$this->_always_resolve = (bool) $config['always_resolve'];
}

/**
Expand Down Expand Up @@ -235,10 +241,10 @@ public function render($group = null, $raw = false)
$inline = $item['raw'];

// only do a file search if the asset is not a URI
if ( ! preg_match('|^(\w+:)?//|', $filename))
if ($this->_always_resolve or ! preg_match('|^(\w+:)?//|', $filename))
{
// and only if the asset is local to the applications base_url
if ( ! preg_match('|^(\w+:)?//|', $this->_asset_url) or strpos($this->_asset_url, \Config::get('base_url')) === 0)
if ($this->_always_resolve or ! preg_match('|^(\w+:)?//|', $this->_asset_url) or strpos($this->_asset_url, \Config::get('base_url')) === 0)
{
if ( ! ($file = $this->find_file($filename, $type)))
{
Expand Down Expand Up @@ -266,6 +272,7 @@ public function render($group = null, $raw = false)
else
{
$file = $this->_asset_url.$file.($this->_add_mtime ? '?'.filemtime($file) : '');
$file = str_replace(str_replace(DS, '/', DOCROOT), '', $file);
}
}
}
Expand All @@ -277,6 +284,10 @@ public function render($group = null, $raw = false)
$file = file_get_contents($file);
$inline = true;
}
else
{
$file = str_replace(str_replace(DS, '/', DOCROOT), '', $file);
}
}
}
else
Expand Down Expand Up @@ -461,8 +472,6 @@ public function find_file($file, $type, $folder = '')

if (is_file($newfile = $path.$folder.$this->_unify_path($file, null, false)))
{
strpos($newfile, DOCROOT) === 0 and $newfile = substr($newfile, strlen(DOCROOT));

// return the file found, make sure it uses forward slashes on Windows
return str_replace(DS, '/', $newfile);
}
Expand Down
Loading

0 comments on commit 22c047f

Please sign in to comment.