srchub-old Commit Details

Date:

2014-12-03 22:45:00 (10 years 4 months ago)

Author:

Natalie Adams

Branch:

default

Commit:

23012f799d08

Parents:

5c2b18c35bc6

Message:

Adding syntax highlighter to base.html

Pre fix for issue 53
Fixing issue 60

Changes:

M	indefero/src/IDF/templates/idf/base.html (2 diffs)
M	pluf/src/Pluf/HTTP/URL.php (1 diff)
M	pluf/src/Pluf/Translation.php (1 diff)

File differences

-62
63 63
64 64
65 
66 
65
66
67 67
68 68
69 69
+        if (isset($_GET['_pluf_action'])) {␊
            return $_GET['_pluf_action'];␊
        }␊
        return (isset($_SERVER['PATH_INFO'])) ?␊
            $_SERVER['PATH_INFO'] : '/';␊
        return (isset($_SERVER['REDIRECT_URL'])) ?␊
            $_SERVER['REDIRECT_URL'] : '/';␊
    }␊
}␊
␊
         if (isset($_GET['_pluf_action'])) {␊
             return $_GET['_pluf_action'];␊
         }␊
-        return (isset($_SERVER['PATH_INFO'])) ?␊
-            $_SERVER['PATH_INFO'] : '/';␊
+        return (isset($_SERVER['REDIRECT_URL'])) ?␊
+            $_SERVER['REDIRECT_URL'] : '/';␊
     }␊
 }␊
 ␊

-70
71 71
72 72
73 
73
74 74
75 75
76 76
+␊
    public static function getLocale()␊
    {␊
        return $GLOBALS['_PX_current_locale'];␊
        return (isset($GLOBALS['_PX_current_locale'])) ? $GLOBALS['_PX_current_locale'] : "en";␊
    }␊
␊
    /**␊
 ␊
     public static function getLocale()␊
     {␊
-        return $GLOBALS['_PX_current_locale'];␊
+        return (isset($GLOBALS['_PX_current_locale'])) ? $GLOBALS['_PX_current_locale'] : "en";␊
     }␊
 ␊
     /**␊