Skip to content

Commit

Permalink
Last minute updates
Browse files Browse the repository at this point in the history
  • Loading branch information
bcosca committed Jan 1, 2015
1 parent b8f7277 commit 079e43b
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 626 deletions.
7 changes: 5 additions & 2 deletions lib/base.php
Original file line number Diff line number Diff line change
Expand Up @@ -2307,9 +2307,12 @@ function alias($key,$arg=null) {
protected function sandbox(array $hive=NULL) {
$this->level++;
$fw=Base::instance();
if (!$hive)
$implicit=false;
if (!$hive) {
$implicit=true;
$hive=$fw->hive();
if ($this->level<2) {
}
if ($this->level<2 || $implicit) {
if ($fw->get('ESCAPE'))
$hive=$this->esc($hive);
if (isset($hive['ALIASES']))
Expand Down
61 changes: 60 additions & 1 deletion lib/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,66 @@
CHANGELOG

3.4.0 (1 January 2015)

* NEW: [redirects] section
* NEW: Custom config sections
* NEW: User-defined AUTOLOAD function
* NEW: ONREROUTE variable
* NEW: Provision for in-memory Jig database (#727)
* Return run() result (#687)
* Pass result of run() to mock() (#687)
* Add port suffix to REALM variable
* New attribute in <include> tag to extend hive
* Adjust unit tests and clean up templates
* Expose header-related methods
* Web->request: allow content array
* Preserve contents of ROUTES (#723)
* Smart detection of PHP functions in template expressions
* Add afterrender() hook to View class
* Implement ArrayAccess and magic properties on hive
* Improvement on mocking of superglobals and request body
* Fix table creation for pgsql handled sessions
* Add QUERY to hive
* Exempt E_NOTICE from default error_reporting()
* Add method to build alias routes from template, fixes #693
* Fix dangerous caching of cookie values
* Fix multiple encoding in nested templates
* Fix node attribute parsing for empty/zero values
* Apply URL encoding on BASE to emulate v2 behavior (#123)
* Improve Base->map performance (#595)
* Add simple backtrace for fatal errors
* Count Cursor->load() results (#581)
* Add form field name to Web->receive() callback arguments
* Fix missing newlines after template expansion
* Fix overwrite of ENCODING variable
* limit & offset workaround for SQL Server, fixes #671
* SQL Mapper->find: GROUP BY SQL compliant statement
* Bug fix: Missing abstract method fields()
* Bug fix: Auto escaping does not work with mapper objects (#710)
* Bug fix: 'with' attribute in <include> tag raise error when no token
inside
* View rendering: optional Content-Type header
* Bug fix: Undefined variable: cache (#705)
* Bug fix: Routing does not work if project base path includes valid
special URI character (#704)
* Bug fix: Template hash collision (#702)
* Bug fix: Property visibility is incorrect (#697)
* Bug fix: Missing Allow header on HTTP 405 response
* Bug fix: Double quotes in lexicon files (#681)
* Bug fix: Space should not be mandatory in ICU pluralization format string
* Bug fix: Incorrect log entry when SQL query contains a question mark
* Bug fix: Error stack trace
* Bug fix: Cookie expiration (#665)
* Bug fix: OR operator (||) parsed incorrectly
* Bug fix: Routing treatment of * wildcard character
* Bug fix: Mapper copyfrom() method doesn't allow class/object callbacks
(#590)
* Bug fix: exists() creates elements/properties (#591)
* Bug fix: Wildcard in routing pattern consumes entire query string (#592)
* Bug fix: Workaround bug in latest MongoDB driver
* Bug fix: Default error handler silently fails for AJAX request with
DEBUG>0 (#599)
* Bug fix: Mocked BODY overwritten (#601)
* Bug fix: Undefined pkey (#607)

3.3.0 (8 August 2014)
* NEW: Attribute in <include> tag to extend hive
Expand Down
4 changes: 2 additions & 2 deletions lib/db/sql/mapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ function select($fields,$filter=NULL,array $options=NULL,$ttl=0) {
$pkeys[]=$key;
if ($options['group']) {
$group=array_unique(array_merge($pkeys,
explode(',',$options['group'])));
$spec=explode(',',$options['group'])));
foreach ($group as &$field) {
$field=$db->quotekey($field);
unset($field);
Expand All @@ -214,7 +214,7 @@ function($str) use($db) {
($db->quotekey($parts[1]).
(isset($parts[2])?(' '.$parts[2]):'')):$str;
},
$group)).') AS '.$db->quotekey('sub').' ON ';
$spec)).') AS '.$db->quotekey('sub').' ON ';
$flag='';
foreach ($pkeys as $pkey)
$sql.=($flag?' AND ':'').$this->table.'.'.
Expand Down
Loading

0 comments on commit 079e43b

Please sign in to comment.