dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// MERGE with 1.4 r7770

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dejala/dejala.php
+3 -3
View File
@@ -22,7 +22,7 @@ class Dejala extends CarrierModule
private $wday_labels ;
private static $INSTANCE = NULL ;
static public function getInstance()
public static function getInstance()
{
if (!self::$INSTANCE)
{
@@ -1000,7 +1000,7 @@ class Dejala extends CarrierModule
}
}
static public function wtf($var, $arrayOfObjectsToHide=null, $fontSize=11)
public static function wtf($var, $arrayOfObjectsToHide=null, $fontSize=11)
{
$text = print_r($var, true);
@@ -1341,7 +1341,7 @@ class Dejala extends CarrierModule
}
// Stolen from PS 1.3 for backwards compatibility in PS 1.2.5
static public function getHttpHost($http = false, $entities = false)
public static function getHttpHost($http = false, $entities = false)
{
$host = (isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST']);
if ($entities)