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/Meta.php
+5 -5
View File
@@ -58,7 +58,7 @@ class MetaCore extends ObjectModel
return parent::getTranslationsFields(array('title', 'description', 'keywords', 'url_rewrite'));
}
static public function getPages($excludeFilled = false, $addPage = false)
public static function getPages($excludeFilled = false, $addPage = false)
{
$selectedPages = array();
if (!$files = scandir(_PS_ROOT_DIR_.'/controllers'))
@@ -74,7 +74,7 @@ class MetaCore extends ObjectModel
if ($excludeFilled)
{
$metas = self::getMetas();
foreach ($metas as $k => $meta)
foreach ($metas as $meta)
if (in_array($meta['page'], $selectedPages))
unset($selectedPages[array_search($meta['page'], $selectedPages)]);
}
@@ -87,7 +87,7 @@ class MetaCore extends ObjectModel
return $selectedPages;
}
static public function getMetas()
public static function getMetas()
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
SELECT *
@@ -109,7 +109,7 @@ class MetaCore extends ObjectModel
return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql);
}
static public function getMetaByPage($page, $id_lang, Context $context = null)
{
if (!$context)
@@ -177,7 +177,7 @@ class MetaCore extends ObjectModel
);
}
static public function getEquivalentUrlRewrite($new_id_lang, $id_lang, $url_rewrite)
public static function getEquivalentUrlRewrite($new_id_lang, $id_lang, $url_rewrite)
{
return Db::getInstance()->getValue('
SELECT url_rewrite