CVS update of Moodle

CVS update of Moodle

by Jim Patridge -
Number of replies: 3
I upgraded my installation of moodle this morning using the cvs update -dP command. All seemed to go well except now when I open the site I get the following error message.

Parse error: parse error, unexpected T_IS_IDENTICAL in /usr/local/etc/httpd/htdocs/moodle/lang/en/resource.php on line 4

Any ideas?

I too am interested in using moodle as part of a postnuke site.

Thanks
Jim
Average of ratings: -
In reply to Jim Patridge

Re: CVS update of Moodle

by Martin Dougiamas -
Picture of Core developers Picture of Documentation writers Picture of Moodle HQ Picture of Particularly helpful Moodlers Picture of Plugin developers Picture of Testers
So what are the contents for that file on your system?

I suspect you'd modified it previously and CVS has tried to do a merge.
In reply to Jim Patridge

Re: CVS update of Moodle

by Dan Eliot -

Ditto, I get basically the same error, and found a "cleanup fix".

Parse error: parse error, unexpected T_IS_IDENTICAL in /home2/edhs/HTML/online/theme/standardlogo/config.php on line 3

Here is what the config looks like after upgrade from 1.1 to 1.2beta:

<<<<<<< config.php
<?PHP // $Id: config.php,v 1.6 2003/05/04 07:58:14 moodler Exp $
=======
<?PHP // $Id: config.php,v 1.6 2003/10/21 06:39:04 moodler Exp $
>>>>>>> 1.6

$THEME->body         = "#FFEECE";  // Main page color
$THEME->cellheading  = "#FFD991";  // Standard headings of big tables
$THEME->cellheading2 = "#FFC85F";  // Highlight headings of tables
$THEME->cellcontent  = "#FFFFFF";  // For areas with text
<<<<<<< config.php
$THEME->cellcontent2 = "#FEE6B9";  // Alternate colour
$THEME->borders      = "#555555";  // Table borders
=======
$THEME->cellcontent2 = "#FFD991";  // Alternate colour
$THEME->borders      = "#FFB62D";  // Table borders
>>>>>>> 1.6
$THEME->highlight    = "#AAFFAA";  // Highlighted text (eg after a search)
$THEME->hidden       = "#AAAAAA";  // To color things that are hidden
$THEME->autolink     = "#EEEEEE";  // To color auto-generated links (eg glossary)

$THEME->custompix    = false;      // If true, then this theme must have a "pix"
                                   // subdirectory that contains copies of all
                                   // files from the moodle/pix directory
                                   // See "cordoroyblue" for an up-to-date example.
?>

Once I removed all of the "junk" created, I got something like this which worked:

<?PHP // $Id: config.php,v 1.6 2003/10/21 06:39:04 moodler Exp $

$THEME->body         = "#FFEECE";  // Main page color
$THEME->cellheading  = "#FFD991";  // Standard headings of big tables
$THEME->cellheading2 = "#FFC85F";  // Highlight headings of tables
$THEME->cellcontent  = "#FFFFFF";  // For areas with text

$THEME->cellcontent2 = "#FEE6B9";  // Alternate colour
$THEME->borders      = "#555555";  // Table borders

$THEME->cellcontent2 = "#FFD991";  // Alternate colour
$THEME->borders      = "#FFB62D";  // Table borders

$THEME->highlight    = "#AAFFAA";  // Highlighted text (eg after a search)
$THEME->hidden       = "#AAAAAA";  // To color things that are hidden
$THEME->autolink     = "#EEEEEE";  // To color auto-generated links (eg glossary)

$THEME->custompix    = false;      // If true, then this theme must have a "pix"
                                   // subdirectory that contains copies of all
                                   // files from the moodle/pix directory
                                   // See "cordoroyblue" for an up-to-date example.
?>

I've had this happen before when upgrading a few times, and would consider it somewhat of a bug. Whether it is a CVS bug or Moodle bug, I don't know.

Dan


In reply to Dan Eliot

Re: CVS update of Moodle

by Dan Eliot -

Also, Styles.php has the same problem, Junk PHP code generated which stops the styles file from working correctly.

BEFORE:

<?PHP /*  $Id: styles.php,v 1.32 2004/02/15 13:58:22 moodler Exp $ */

/// We use PHP so we can do value substitutions into the styles

<<<<<<< styles.php
=======
    if (!isset($themename)) {
        $themename = NULL;
    }

    $nomoodlecookie = true;
>>>>>>> 1.32
    require_once("../../config.php");

    header("Content-type: text/css");  // Correct MIME type

    if (isset($themename)) {
        $CFG->theme = $themename;
    }

    $themeurl = "$CFG->wwwroot/theme/$CFG->theme";

/// From here on it's nearly a normal stylesheet.
/// First are some CSS definitions for normal tags,
/// then custom tags follow.
///
/// New classes always get added to the end of the file.
///
/// Note that a group of standard colours are all
/// defined in config.php in this directory.  The
/// reason for this is because Moodle uses the same
/// colours to provide oldstyle formatting for
/// browsers without CSS.
///
/// You can hardcode colours in this file if you
/// don't care about this.

?>

AFTER:

<?PHP /*  $Id: styles.php,v 1.32 2004/02/15 13:58:22 moodler Exp $ */

/// We use PHP so we can do value substitutions into the styles

    if (!isset($themename)) {
        $themename = NULL;
    }

    $nomoodlecookie = true;

    require_once("../../config.php");

    header("Content-type: text/css");  // Correct MIME type

    if (isset($themename)) {
        $CFG->theme = $themename;
    }

    $themeurl = "$CFG->wwwroot/theme/$CFG->theme";

/// From here on it's nearly a normal stylesheet.
/// First are some CSS definitions for normal tags,
/// then custom tags follow.
///
/// New classes always get added to the end of the file.
///
/// Note that a group of standard colours are all
/// defined in config.php in this directory.  The
/// reason for this is because Moodle uses the same
/// colours to provide oldstyle formatting for
/// browsers without CSS.
///
/// You can hardcode colours in this file if you
/// don't care about this.

?>

Hope this helps,

Dan