fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for languages

Browse Source
This commit is contained in:
Gustavo Adolfo Cruz Laura
2011-01-21 22:54:05 +00:00
parent 4cd8a15c73
commit 0765704db5
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.languages.php
View File

@@ -293,7 +293,7 @@ class languages {
$category, $category,
$id, $id,
$LOCALE, $LOCALE,
trim(str_replace(chr(10), '', $rowTranslation['msgstr'])) trim(str_replace(chr(10), '', stripslashes($rowTranslation['msgstr'])))
); );
if( $result['codError'] == 0 ) if( $result['codError'] == 0 )
$countItemsSuccess++; $countItemsSuccess++;

9
workflow/engine/classes/model/Content.php
View File

@@ -284,15 +284,22 @@ class Content extends BaseContent {
$c->addSelectColumn(ContentPeer::CON_LANG); $c->addSelectColumn(ContentPeer::CON_LANG);
$c->add ( ContentPeer::CON_LANG, $lanId ); $c->add ( ContentPeer::CON_LANG, $lanId );
$result = ContentPeer::doSelectRS ( $c ); $result = ContentPeer::doSelectRS ( $c );
$result->setFetchmode(ResultSet::FETCHMODE_ASSOC); $result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$result->next (); $result->next ();
$row = $result->getRow (); $row = $result->getRow ();
while ( is_array ( $row ) ) { while ( is_array ( $row ) ) {
ContentPeer::doDelete ( array ($row['CON_CATEGORY'], $row['CON_PARENT'], $row['CON_ID'], $lanId ) ); $content = ContentPeer::retrieveByPK( $row['CON_CATEGORY'], '', $row['CON_ID'], $lanId);
if( get_class($content) == 'Content' )
$content->delete();
$result->next (); $result->next ();
$row = $result->getRow (); $row = $result->getRow ();
} }
} catch ( Exception $e ) { } catch ( Exception $e ) {
throw ($e); throw ($e);
} }

4
workflow/engine/methods/setup/language_Ajax.php
View File

@@ -142,7 +142,9 @@ try {
} }
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn('COUNT('.ContentPeer::CON_CATEGORY.')'); //$oCriteria->addSelectColumn('COUNT('.ContentPeer::CON_CATEGORY.')');
$oCriteria->addSelectColumn(ContentPeer::CON_CATEGORY);
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
$oCriteria->add(ContentPeer::CON_LANG, $locale); $oCriteria->add(ContentPeer::CON_LANG, $locale);
$oCriteria->add(ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL ); $oCriteria->add(ContentPeer::CON_CATEGORY, 'APP_TITLE', Criteria::EQUAL );
$oDataset = ContentPeer::doSelectRS($oCriteria); $oDataset = ContentPeer::doSelectRS($oCriteria);