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

[-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12552 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-01-19 10:14:10 +00:00
parent 81832703f2
commit 6887541bdd
82 changed files with 432 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminTranslationsController.php
+5 -5
View File
@@ -114,7 +114,7 @@ class AdminTranslationsControllerCore extends AdminController
'packs_to_install' => $packs_to_install,
'packs_to_update' => $packs_to_update,
'url_submit' => self::$currentIndex.'&token='.$this->token,
'themes' => $themes = self::getThemesList(),
'themes' => $themes = AdminTranslationsController::getThemesList(),
'url_create_language' => 'index.php?tab=AdminLanguages&addlang&token='.Tools::getAdminToken('AdminLanguages'.(int)(Tab::getIdFromClassName('AdminLanguages')).(int)$this->context->employee->id),
);
@@ -1478,7 +1478,7 @@ class AdminTranslationsControllerCore extends AdminController
);
$arr_files_to_parse = array_merge($arr_files_to_parse, $modules_has_mails);
foreach ($arr_files_to_parse as $path) {
$subject_mail = self::getSubjectMail($path, $subject_mail);
$subject_mail = AdminTranslationsController::getSubjectMail($path, $subject_mail);
}
$core_mails = $this->getMailFiles(_PS_MAIL_DIR_, $lang, 'core_mail');
@@ -1580,7 +1580,7 @@ class AdminTranslationsControllerCore extends AdminController
}
}
if ($filename != '.svn' AND $filename != '.' AND $filename != '..' AND is_dir(($directory.'/'.$filename)))
$subject_mail = self::getSubjectMail($directory.'/'.$filename, $subject_mail);
$subject_mail = AdminTranslationsController::getSubjectMail($directory.'/'.$filename, $subject_mail);
}
return $subject_mail;
}
@@ -1682,7 +1682,7 @@ class AdminTranslationsControllerCore extends AdminController
if ($module{0} != '.' AND is_dir($root_dir.$module))
{
@include($root_dir.$module.'/'.$lang.'.php');
self::getModuleTranslations($is_default);
AdminTranslationsController::getModuleTranslations($is_default);
$this->recursiveGetModuleFiles($root_dir.$module.'/', $array_files, $module, $root_dir.$module.'/'.$lang.'.php', $is_default);
}
}
@@ -1750,7 +1750,7 @@ class AdminTranslationsControllerCore extends AdminController
* @return array containing all datas needed for building the translation form
* @since 1.4.5.0
*/
private function _parsePdfClass($filepath, $regex, $langArray, $tab, $tabs_array)
protected function _parsePdfClass($filepath, $regex, $langArray, $tab, $tabs_array)
{
$content = file_get_contents($filepath);
preg_match_all($regex, $content, $matches);