From 1d4adb36f94fd8ad4c5a071a6f16a960d25c1d7b Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Wed, 2 Nov 2005 03:52:22 +0000
Subject: [PATCH] corrected version number in last commit[1309] 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
---
 VERSION.txt                                   |  2 +-
 cake/libs/view/helpers/javascript.php         | 36 +++++++++----------
 .../libs/view/templates/layouts/default.thtml |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

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 @@
   	<div id="pb-cake">
 	  	&copy; 2005 CakePHP ::
 	  	<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">
 			<?php echo $html->image('cake.power.png', array('alt'=>"CakePHP : Rapid Development Framework", 'border'=>"0"))?>
 		</a>