Merge branch 'public' into release-1.5

modolabs · Aug 15, 2012 · e9a25ed · e9a25ed
2 parents d841f3c + d5798aa
commit e9a25ed
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/doc/mw/conf.py b/doc/mw/conf.py
@@ -50,7 +50,7 @@
 # The short X.Y version.
 version = '1.5'
 # The full version, including alpha/beta/rc tags.
-release = '1.5 RC1'
+release = '1.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/lib/Kurogo.php b/lib/Kurogo.php
@@ -10,7 +10,7 @@
  */
 
 define('ROOT_DIR', realpath(dirname(__FILE__).'/..'));
-define('KUROGO_VERSION', '1.5RC1');
+define('KUROGO_VERSION', '1.5');
 
 //
 // And a double quote define for ini files (php 5.1 can't escape them)

diff --git a/www/index.php b/www/index.php
@@ -291,7 +291,7 @@ function deepStripSlashes($v) {
     // find the page part
     if (isset($parts[1])) {
       if (strlen($parts[1])) {
-        $page = rtrim($parts[1], '.php');
+        $page = $parts[1];
       }
 
     } else {