Skip to content

Fixed error with String class in PHP>5.6 and CakePHP 2.9 #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: cake2.2
Choose a base branch
from
Open

Fixed error with String class in PHP>5.6 and CakePHP 2.9 #142

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Model/Datasource/MongodbSource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ public function dropSchema(CakeSchema $schema, $tableName = null) {
$return = "toDrop = :tables;\nfor( i = 0; i < toDrop.length; i++ ) {\n\tdb[toDrop[i]].drop();\n}";
$tables = '["' . implode($toDrop, '", "') . '"]';

return String::insert($return, compact('tables'));
return CakeText::insert($return, compact('tables'));
}

/**
Expand Down Expand Up @@ -1316,7 +1316,7 @@ public function mapReduce($query, $timeout = null) {
* @return mixed Prepared value or array of values.
* @access public
*/
public function value($data, $column = null) {
public function value($data, $column = null, $null = true) {
if (is_array($data) && !empty($data)) {
return array_map(
array(&$this, 'value'),
Expand Down Expand Up @@ -1473,7 +1473,7 @@ public function setTimeout($ms){
public function logQuery($query, $args = array()) {
if ($args) {
$this->_stringify($args);
$query = String::insert($query, $args);
$query = CakeText::insert($query, $args);
}
$this->took = round((microtime(true) - $this->_startTime) * 1000, 0);
$this->affected = null;
Expand Down