adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

corrected version number in last commit[1309]

Browse source 
Author: phpnut
Date: 9:41:14 PM, Tuesday, November 01, 2005
Message:
Added fix for Ticket #116


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1311 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2005-11-02 03:52:22 +00:00
parent 56ac9d4d3f
commit 1d4adb36f9
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION.txt
View file

@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ // // +---------------------------------------------------------------------------------------------------+ //
/////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////
0.10.3.1308_pre_beta 0.10.3.1311_pre_beta

36
cake/libs/view/helpers/javascript.php
View file

@ -153,30 +153,30 @@ class JavascriptHelper extends Helper
* Includes the Prototype Javascript library (and anything else) inside a single script tag. * Includes the Prototype Javascript library (and anything else) inside a single script tag.
* *
* Note: The recommended approach is to copy the contents of * Note: The recommended approach is to copy the contents of
* lib/javascripts/ into your application's * javascripts into your application's
* public/javascripts/ directory, and use @see javascriptIncludeTag() to * public/javascripts/ directory, and use @see javascriptIncludeTag() to
* create remote script links. * create remote script links.
* @return string script with all javascript in /javascripts folder * @return string script with all javascript in /javascripts folder
*/ */
function includeScript ($script = "") function includeScript ($script = "")
{ {
$dir = $this->webroot . JS_URL; if($script == "")
if($script == "") { {
$files = scandir($dir); $files = scandir(JS);
$javascript = ''; $javascript = '';
foreach($files as $file) foreach($files as $file)
{ {
if (substr($file, -3) == '.js') if (substr($file, -3) == '.js')
{ {
$javascript .= file_get_contents("{$dir}{$file}") . "\n\n"; $javascript .= file_get_contents(JS."{$file}") . "\n\n";
} }
} }
} }
else else
{ {
$javascript = file_get_contents("{$dir}$script.js") . "\n\n"; $javascript = file_get_contents(JS."$script.js") . "\n\n";
} }
return $this->codeBlock("\n\n" . $javascript); return $this->codeBlock("\n\n" . $javascript);
} }
} }

2
cake/libs/view/templates/layouts/default.thtml
View file

@ -48,7 +48,7 @@
<div id="pb-cake"> <div id="pb-cake">
&copy; 2005 CakePHP :: &copy; 2005 CakePHP ::
<a href="https://trac.cakephp.org/wiki/Authors">CakePHP Developers and Authors</a> <a href="https://trac.cakephp.org/wiki/Authors">CakePHP Developers and Authors</a>
<p>CakePHP version 0.10.3.1308_pre_beta</p> <p>CakePHP version 0.10.3.1311_pre_beta</p>
<a href="http://www.cakephp.org/" target="_new" class="simple"> <a href="http://www.cakephp.org/" target="_new" class="simple">
<?php echo $html->image('cake.power.png', array('alt'=>"CakePHP : Rapid Development Framework", 'border'=>"0"))?> <?php echo $html->image('cake.power.png', array('alt'=>"CakePHP : Rapid Development Framework", 'border'=>"0"))?>
</a> </a>