Skip to content

Hotfix: yield is a keyword in PHP5.5, replaced with yield_content #2

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
notacouch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Hotfix: yield is a keyword in PHP5.5, replaced with yield_content #2

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function has_content($key) {
return isset($content[$key]);
}

function yield($key = 'default', $echo = true) {
function yield_content($key = 'default', $echo = true) {
global $content;

$out = has_content($key) ? $content[$key] : '';
Expand Down
9 changes: 4 additions & 5 deletions layouts/application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
<head>
<meta charset="utf-8">
<title><?php echo has_content('title') ? yield('title', false) . ' - ' : ''; ?>[SITE NAME]</title>
<title><?php echo has_content('title') ? yield_content('title', false) . ' - ' : ''; ?>[SITE NAME]</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<base href="<?php echo $config['base_url']; ?>">
<!--[if ! lte IE 6]><!-->
<link rel="stylesheet" href="css/application.css">
<?php yield('stylesheets'); ?>
<?php yield_content('stylesheets'); ?>
<!--<![endif]-->
<!--[if lte IE 6]>
<link rel="stylesheet" href="css/libs/ie6.1.1.css">
Expand All @@ -19,11 +18,11 @@
<script src="js/libs/modernizr-2.7.0.min.js"></script>
</head>
<body>
<?php yield(); ?>
<?php yield_content(); ?>

<!--[if ! lte IE 6]><!-->
<script src="js/libs/jquery-1.10.2.min.js"></script>
<?php javascripts('script'); yield('javascripts'); ?>
<?php javascripts('script'); yield_content('javascripts'); ?>
<!--<![endif]-->

<?php if ($config['google_analytics_web_property_id'] != ''): ?>
Expand Down