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
classes/Profile.php
+2 -2
View File
@@ -58,7 +58,7 @@ class ProfileCore extends ObjectModel
*
* @return array Profiles
*/
static public function getProfiles($id_lang)
public static function getProfiles($id_lang)
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
SELECT p.`id_profile`, `name`
@@ -72,7 +72,7 @@ class ProfileCore extends ObjectModel
*
* @return string Profile
*/
static public function getProfile($id_profile, $id_lang = NULL)
public static function getProfile($id_profile, $id_lang = NULL)
{
if ($id_lang == NULL)
$id_lang = Configuration::get('PS_LANG_DEFAULT');