adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.1' into 2.2

Browse source
This commit is contained in:
Jose Lorenzo Rodriguez 2012-07-01 17:35:24 -04:30
commit ec7ec73b66
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/View/Pages/home.ctp
View file

@ -130,8 +130,8 @@ if (isset($filePresent)):
<h3><?php echo __d('cake_dev', 'Editing this Page'); ?></h3> <h3><?php echo __d('cake_dev', 'Editing this Page'); ?></h3>
<p> <p>
<?php <?php
echo __d('cake_dev', 'To change the content of this page, create: APP/View/Pages/home.ctp.<br /> echo __d('cake_dev', 'To change the content of this page, edit: APP/View/Pages/home.ctp.<br />
To change its layout, create: APP/View/Layouts/default.ctp.<br /> To change its layout, edit: APP/View/Layouts/default.ctp.<br />
You can also add some CSS styles for your pages at: APP/webroot/css.'); You can also add some CSS styles for your pages at: APP/webroot/css.');
?> ?>
</p> </p>

2
lib/Cake/Network/CakeRequest.php
View file

@ -663,7 +663,7 @@ class CakeRequest implements ArrayAccess {
* *
* #### Check for a single type: * #### Check for a single type:
* *
* `$this->request->accepts('json');` * `$this->request->accepts('application/json');`
* *
* This method will order the returned content types by the preference values indicated * This method will order the returned content types by the preference values indicated
* by the client. * by the client.

7
lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
View file

@ -177,12 +177,15 @@ class CakeFixtureManager {
$sources = $db->listSources(); $sources = $db->listSources();
$table = $db->config['prefix'] . $fixture->table; $table = $db->config['prefix'] . $fixture->table;
$exists = in_array($table, $sources);
if ($drop && in_array($table, $sources)) { if ($drop && $exists) {
$fixture->drop($db); $fixture->drop($db);
$fixture->create($db); $fixture->create($db);
} elseif (!in_array($table, $sources)) { } elseif (!$exists) {
$fixture->create($db); $fixture->create($db);
} else {
$fixture->created[] = $db->configKeyName;
} }
} }