diff --git a/VERSION.txt b/VERSION.txt index 39a214658..efbfc8478 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -6,4 +6,4 @@ // +---------------------------------------------------------------------------------------------------+ // /////////////////////////////////////////////////////////////////////////////////////////////////////////// -0.10.3.1308_pre_beta \ No newline at end of file +0.10.3.1311_pre_beta \ No newline at end of file diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php index 435519239..93f408e3f 100644 --- a/cake/libs/view/helpers/javascript.php +++ b/cake/libs/view/helpers/javascript.php @@ -153,30 +153,30 @@ class JavascriptHelper extends Helper * Includes the Prototype Javascript library (and anything else) inside a single script tag. * * 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 * create remote script links. * @return string script with all javascript in /javascripts folder */ function includeScript ($script = "") { - $dir = $this->webroot . JS_URL; - if($script == "") { - $files = scandir($dir); - $javascript = ''; - foreach($files as $file) - { - if (substr($file, -3) == '.js') - { - $javascript .= file_get_contents("{$dir}{$file}") . "\n\n"; - } - } - } - else - { - $javascript = file_get_contents("{$dir}$script.js") . "\n\n"; - } - return $this->codeBlock("\n\n" . $javascript); + if($script == "") + { + $files = scandir(JS); + $javascript = ''; + foreach($files as $file) + { + if (substr($file, -3) == '.js') + { + $javascript .= file_get_contents(JS."{$file}") . "\n\n"; + } + } + } + else + { + $javascript = file_get_contents(JS."$script.js") . "\n\n"; + } + return $this->codeBlock("\n\n" . $javascript); } } diff --git a/cake/libs/view/templates/layouts/default.thtml b/cake/libs/view/templates/layouts/default.thtml index 3b6688529..681eaeade 100644 --- a/cake/libs/view/templates/layouts/default.thtml +++ b/cake/libs/view/templates/layouts/default.thtml @@ -48,7 +48,7 @@
CakePHP version 0.10.3.1308_pre_beta
+CakePHP version 0.10.3.1311_pre_beta
image('cake.power.png', array('alt'=>"CakePHP : Rapid Development Framework", 'border'=>"0"))?>